summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785Brandon Casey2008-09-301-2/+0
* Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" ...David Bryson2008-09-301-6/+3
* tests: grep portability fixesJeff King2008-09-308-11/+11
* Add OS X support to the pre-auto-gc example hookJonathan del Strother2008-09-301-3/+7
* Correct typos in RelNotes-1.6.1Ralf Wildenhues2008-09-302-3/+3
* remove vim syntax highlighting in favor of upstreamSZEDER Gábor2008-09-302-26/+30
* Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-2915-120/+139
|\
| * Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce2008-09-2952-196/+600
| |\
| | * Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-295-49/+72
| | |\
| | * \ Merge branch 'mg/maint-remote-fix' into maintShawn O. Pearce2008-09-291-8/+15
| | |\ \
| | | * | make "git remote" report multiple URLsMichael J Gruber2008-09-221-8/+15
| | * | | Clarify commit error message for unmerged filesRafael Garcia-Suarez2008-09-291-1/+1
| | * | | Use strchrnul() instead of strchr() plus manual workaroundJohan Herland2008-09-291-3/+1
| | * | | Use remove_path from dir.c instead of own implementationAlex Riesen2008-09-293-49/+5
| | * | | Add remove_path: a function to remove as much as possible of a pathAlex Riesen2008-09-292-0/+23
| | * | | git-submodule: Fix "Unable to checkout" for the initial 'update'Ping Yin2008-09-291-2/+7
| | * | | Clarify how the user can satisfy stash's 'dirty state' check.Stephen Haberman2008-09-291-1/+1
| * | | | t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey2008-09-232-2/+2
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-221-0/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey2008-09-221-0/+11
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-201-1/+3
| |\ \ \ \ | | |/ / /
| | * | | diff hunk pattern: fix misconverted "\{" tex macro introducersJunio C Hamano2008-09-201-2/+2
| * | | | diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano2008-09-202-8/+11
| * | | | diff: use extended regexp to find hunk headersJunio C Hamano2008-09-191-3/+3
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-191-14/+17
| |\ \ \ \ | | |/ / /
| | * | | diff: use extended regexp to find hunk headersJunio C Hamano2008-09-191-14/+17
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-1837-123/+266
| |\ \ \ \ | | |/ / /
| | * | | diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-183-3/+8
| | * | | diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-183-12/+15
| | * | | diff.c: return pattern entry pointer rather than just the hunk header patternBrandon Casey2008-09-181-27/+28
| | | |/ | | |/|
* | | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-2913-119/+685
|\ \ \ \
| * | | | Fix AsciiDoc errors in merge documentationJohan Herland2008-09-041-4/+4
| * | | | git-merge documentation: describe how conflict is presentedJunio C Hamano2008-08-311-0/+65
| * | | | checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-313-48/+72
| * | | | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-303-5/+173
| * | | | Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Junio C Hamano2008-08-303-24/+177
| |\ \ \ \
| | * | | | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-303-3/+72
| | * | | | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-303-24/+59
| * | | | | git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano2008-08-302-6/+14
| * | | | | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-305-1/+47
| * | | | | rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano2008-08-301-2/+8
| * | | | | rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano2008-08-301-10/+13
| * | | | | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano2008-08-302-3/+10
| * | | | | xmerge.c: minimum readability fixupsJunio C Hamano2008-08-301-7/+7
| * | | | | xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-304-21/+135
| * | | | | xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano2008-08-301-51/+70
* | | | | | Add contrib/rerere-train scriptNanako Shiraishi2008-09-291-0/+52
* | | | | | mingw: remove use of _getdrive() from lstat/fstatDmitry Potapov2008-09-291-3/+2
* | | | | | compat/mingw: Support a timeout in the poll emulation if no fds are givenJohannes Sixt2008-09-291-1/+6
* | | | | | usage.c: remove unused functionsNanako Shiraishi2008-09-292-19/+0
View Lorry Controller Status