Commits

Commit:
5b5b660da681f777aa32148ee57a66306ea74ce9
From:
Klemens Nanni <kn@openbsd.org>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Document command aliases in tmux(1) style, add tags for navigation Complete 95f394e8917def2c11ce292b3a8f804d261b1d12; reminder to look at gotadmin(1) from stsp, thanks.
diff | patch | tree
Commit:
d52bac284bc87b2e54ff8afd22886a7260f68b26
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
ignore unversioned files while aborting rebase, histedit, merge or operations ok jrick
diff | patch | tree
Commit:
ac93b2c5ff1f2b9d2c10aaf6b385b22b9da35056
From:
Klemens Nanni <kn@openbsd.org>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Fix "mandoc -T lint -W style got/got.1" nits
diff | patch | tree
Commit:
e8aa341a0a112d2660938b2e9aec7ff327865ec6
From:
Klemens Nanni <kn@openbsd.org>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Document command aliases in tmux(1) style, add tags for navigation This has the advantage of tags being located right by the full command; combined with tags ":tco" to search for the `co` alias will jump right to the `checkout` line, neatly showing everything without needing further navigation. tmux hint from Thomas Adam, thanks. OK stsp
diff | patch | tree
Commit:
b87752b722a779d961ddb162ea428d97649121d5
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
update 'got merge' TODO item
diff | patch | tree
Commit:
a14a3000a50e1fe5e299c5522e3086eec2a8cf2c
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
bump version number
diff | patch | tree
Commit:
bf52745616210612f9793d2dfae661bd8afc73bb
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
CHANGES for 0.61
diff | patch | tree
Commit:
8f7987b35cf5b218a730c88ed2a06979b6384bbd
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
sync dist file list
diff | patch | tree
Commit:
6092c29954d72000fdc1b6fe2a9c10ff56aabc65
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
skip ignored directories during 'got status' disk crawl
diff | patch | tree
Commit:
c50a74557db04e5ab02a1b0c53cb4fbdd64088ac
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
add histedit -e option which runs the 'edit' script command for every commit ok jrick
diff | patch | tree
Commit:
839511b2e2ef1858aa18758d757677b5b8af7269
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix typo in configure's libcrypto check; patch by Evan Silberman
diff | patch | tree
Commit:
4ed6a25a57908665dbf18eab0ea8a65036c9397f
From:
Stefan Sperling <stsp@stsp.name>
Date:
make ignore patterns work with 'got status' ok thomas.adam
diff | patch | tree
Commit:
3e0a6c2640c2e1d8efece7de2b15d091da74b5ea
From:
Thomas Adam <thomas@xteddy.org>
Date:
portable: update .gitignore Add .orig to gitgnore.
diff | patch | tree
Commit:
f60607c885e6c72e0bd0647907573da3c9acbc43
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
explicitly set the default branch name after 'git init' in regress tests We need to do this because newer versions of Git support an arbitrary default branch name which can be set by users. We don't want tests to fail when this option is used. pointed out by Thomas Adam
diff | patch | tree
Commit:
ccd081e7f1f2b65ac6191c78813dcd622b559dd0
From:
Christian Weisgerber <naddy@mips.inka.de>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
pull in a type fix from the OpenBSD parse.y template Original commit message by deraadt: (unsigned) means (unsigned int) which on ptrdiff_t or size_t or other larger types really is a range reduction... Almost any cast to (unsigned) is a bug.
diff | patch | tree
Commit:
d7a84292effc482dbe4e4b5ade0b231e3b0f6e73
From:
Christian Weisgerber <naddy@mips.inka.de>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
fix unsigned/signed char mismatch in parse.y
diff | patch | tree
Commit:
cc1cb6fe00a13f31ed58d5f0d2e612f74b83acc2
From:
Thomas Adam <thomas@xteddy.org>
Date:
portable: compat: remove unused files Fix up a weird automerge where some files referenced are either not used any more or have already been included.
diff | patch | tree
Commit:
6bfde1268002c4a3d3dd6c203edb3399339aaeae
From:
Thomas Adam <thomas@xteddy.org>
Date:
portable: fix READMEs Remove conflict markers in README, and add mailing-list link to both READMEs. Noticed by stsp
diff | patch | tree
Commit:
2a00e21c0c6aadccf2d86abbeaa0252c54ae87db
From:
Thomas Adam <thomas@xteddy.org>
Date:
portable: initial Linux compilation This commit modifies the GoT main branch to be able to compile it under linux.
diff | patch | tree
Commit:
22a38a4331904c508c1782e5399680ba7069300f
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
update a CAVEAT in got.1 now that 'got merge' exists
diff | patch | tree
Commit:
dddbe150a21f404e9c42033d9b00b5561001df7e
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
interrupt 'got histedit' upon missing/unversioned/not-deleted files
diff | patch | tree
Commit:
bb494413b7b04767e20fc5a04378d517cda008ad
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
diff | patch | tree
Commit:
8cf2970b6c6851169342b56a57bfe72560170f1a
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
document all reasons why 'got merge' might be interrupted
diff | patch | tree
Commit:
ba1629912dc172d6dfe5d0c09cb1e60c15c01899
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
make 'got merge' interrupt the merge upon undeleted and unversioned files
diff | patch | tree
Commit:
0ef688596bd8c81c1cf6abdee7aedc07e1cbcbbc
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
print additional stats about things that went wrong during a merge
diff | patch | tree