summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-09-30rebase: Support preserving merges in non-interactive modeLibravatar Andreas Ericsson3-5/+81
2008-09-30Merge branch 'maint'Libravatar Shawn O. Pearce3-5/+5
2008-09-30git-svn: call 'fatal' correctly in set-treeLibravatar Luc Heinrich1-1/+1
2008-09-30Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)Libravatar Michael Prokop1-4/+4
2008-09-30diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785Libravatar Brandon Casey1-2/+0
2008-09-30Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" ...Libravatar David Bryson1-6/+3
2008-09-30tests: grep portability fixesLibravatar Jeff King8-11/+11
2008-09-30Add OS X support to the pre-auto-gc example hookLibravatar Jonathan del Strother1-3/+7
2008-09-30t0024: add executable permissionLibravatar SZEDER Gábor1-0/+0
2008-09-30Correct typos in RelNotes-1.6.1Libravatar Ralf Wildenhues2-3/+3
2008-09-30remove vim syntax highlighting in favor of upstreamLibravatar SZEDER Gábor2-26/+30
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Libravatar Shawn O. Pearce15-120/+139
2008-09-29Merge branch 'maint' into bc/master-diff-hunk-header-fixLibravatar Shawn O. Pearce52-196/+600
2008-09-29Merge branch 'bc/maint-diff-hunk-header-fix' into maintLibravatar Shawn O. Pearce5-49/+72
2008-09-29Merge branch 'jc/better-conflict-resolution'Libravatar Shawn O. Pearce13-119/+685
2008-09-29Merge branch 'mg/maint-remote-fix' into maintLibravatar Shawn O. Pearce1-8/+15
2008-09-29Add contrib/rerere-train scriptLibravatar Nanako Shiraishi1-0/+52
2008-09-29Clarify commit error message for unmerged filesLibravatar Rafael Garcia-Suarez1-1/+1
2008-09-29Use strchrnul() instead of strchr() plus manual workaroundLibravatar Johan Herland1-3/+1
2008-09-29mingw: remove use of _getdrive() from lstat/fstatLibravatar Dmitry Potapov1-3/+2
2008-09-29Use remove_path from dir.c instead of own implementationLibravatar Alex Riesen3-49/+5
2008-09-29Add remove_path: a function to remove as much as possible of a pathLibravatar Alex Riesen2-0/+23
2008-09-29git-submodule: Fix "Unable to checkout" for the initial 'update'Libravatar Ping Yin1-2/+7
2008-09-29compat/mingw: Support a timeout in the poll emulation if no fds are givenLibravatar Johannes Sixt1-1/+6
2008-09-29Clarify how the user can satisfy stash's 'dirty state' check.Libravatar Stephen Haberman1-1/+1
2008-09-29usage.c: remove unused functionsLibravatar Nanako Shiraishi2-19/+0
2008-09-26Merge branch 'maint'Libravatar Shawn O. Pearce3-5/+23
2008-09-26Cleanup remove_pathLibravatar Alex Riesen1-5/+3
2008-09-26Remove empty directories in recursive mergeLibravatar Alex Riesen2-3/+12
2008-09-26Documentation: clarify the details of overriding LESS via core.pagerLibravatar Chris Frey1-2/+11
2008-09-25Merge branch 'mv/merge-recursive'Libravatar Shawn O. Pearce8-1454/+1580
2008-09-25Merge branch 'jc/alternate-push'Libravatar Shawn O. Pearce14-34/+114
2008-09-25Merge branch 'am/status'Libravatar Shawn O. Pearce2-15/+30
2008-09-25Merge branch 'pb/autocorrect-wrapper'Libravatar Shawn O. Pearce1-8/+24
2008-09-25Merge branch 'mv/commit-tree'Libravatar Shawn O. Pearce5-57/+79
2008-09-25Merge branch 'jc/apply-include-exclude'Libravatar Shawn O. Pearce2-16/+46
2008-09-25Merge branch 'jc/safe-c-l-d'Libravatar Shawn O. Pearce1-1/+5
2008-09-25gitweb: shortlog now also obeys $hash_parentLibravatar Giuseppe Bilotta1-1/+5
2008-09-25Merge branch 'ho/dirstat-by-file'Libravatar Shawn O. Pearce3-1/+13
2008-09-25Merge git://repo.or.cz/git-guiLibravatar Shawn O. Pearce9-141/+793
2008-09-25Merge branch 'maint'Libravatar Shawn O. Pearce7-6/+49
2008-09-25Update release notes for 1.6.0.3Libravatar Shawn O. Pearce1-1/+17
2008-09-25Fix submodule sync with relative submodule URLsLibravatar Johan Herland1-0/+8
2008-09-25graph.c: make many functions staticLibravatar Nanako Shiraishi2-54/+43
2008-09-25remote.c: make free_ref(), parse_push_refspec() and free_refspecs() static.Libravatar Nanako Shiraishi2-5/+3
2008-09-25checkout: Do not show local changes when in quiet modeLibravatar Jonas Fonseca1-1/+1
2008-09-24for-each-ref: Fix --format=%(subject) for log message without newlinesLibravatar Johan Herland1-2/+2
2008-09-24git-web--browse: Support for using /bin/start on MinGWLibravatar Petr Baudis2-2/+7
2008-09-24git-gui: Reenable staging unmerged files by clicking the icon.Libravatar Alexander Gavrilov3-33/+70
2008-09-24git-gui: Support the encoding menu in gui blame.Libravatar Alexander Gavrilov1-0/+17