aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'maint'Shawn O. Pearce2008-09-30
|\
| * git-svn: call 'fatal' correctly in set-treeLuc Heinrich2008-09-30
| * Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)Michael Prokop2008-09-30
| * t0024: add executable permissionSZEDER Gábor2008-09-30
* | diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785Brandon Casey2008-09-30
* | Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" ...David Bryson2008-09-30
* | tests: grep portability fixesJeff King2008-09-30
* | Add OS X support to the pre-auto-gc example hookJonathan del Strother2008-09-30
* | Correct typos in RelNotes-1.6.1Ralf Wildenhues2008-09-30
* | remove vim syntax highlighting in favor of upstreamSZEDER Gábor2008-09-30
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-29
|\ \
| * \ Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce2008-09-29
| |\ \ | | |/
| | * Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-29
| | |\
| | * \ Merge branch 'mg/maint-remote-fix' into maintShawn O. Pearce2008-09-29
| | |\ \
| | | * | make "git remote" report multiple URLsMichael J Gruber2008-09-22
| | * | | Clarify commit error message for unmerged filesRafael Garcia-Suarez2008-09-29
| | * | | Use strchrnul() instead of strchr() plus manual workaroundJohan Herland2008-09-29
| | * | | Use remove_path from dir.c instead of own implementationAlex Riesen2008-09-29
| | * | | Add remove_path: a function to remove as much as possible of a pathAlex Riesen2008-09-29
| | * | | git-submodule: Fix "Unable to checkout" for the initial 'update'Ping Yin2008-09-29
| | * | | Clarify how the user can satisfy stash's 'dirty state' check.Stephen Haberman2008-09-29
| * | | | t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey2008-09-23
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-22
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey2008-09-22
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-20
| |\ \ \ \ | | |/ / /
| | * | | diff hunk pattern: fix misconverted "\{" tex macro introducersJunio C Hamano2008-09-20
| * | | | diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano2008-09-20
| * | | | diff: use extended regexp to find hunk headersJunio C Hamano2008-09-19
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-19
| |\ \ \ \ | | |/ / /
| | * | | diff: use extended regexp to find hunk headersJunio C Hamano2008-09-19
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-18
| |\ \ \ \ | | |/ / /
| | * | | diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-18
| | * | | diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-18
| | * | | diff.c: return pattern entry pointer rather than just the hunk header patternBrandon Casey2008-09-18
| | | |/ | | |/|
* | | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\ \ \ \
| * | | | Fix AsciiDoc errors in merge documentationJohan Herland2008-09-04
| * | | | git-merge documentation: describe how conflict is presentedJunio C Hamano2008-08-31
| * | | | checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-31
| * | | | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-30
| * | | | Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Junio C Hamano2008-08-30
| |\ \ \ \
| | * | | | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-30
| | * | | | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-30
| * | | | | git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano2008-08-30
| * | | | | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-30
| * | | | | rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano2008-08-30
| * | | | | rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano2008-08-30
| * | | | | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano2008-08-30
| * | | | | xmerge.c: minimum readability fixupsJunio C Hamano2008-08-30
| * | | | | xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-30
| * | | | | xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano2008-08-30
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-06 01:49:23 +0000