summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-04-05simplify output of conflicting mergeLibravatar Clemens Buchacher1-13/+4
2009-04-05update cache for conflicting submodule entriesLibravatar Clemens Buchacher2-3/+4
2009-04-05add tests for merging with submodulesLibravatar Clemens Buchacher1-0/+74
2009-04-02GIT 1.6.2.2Libravatar Junio C Hamano2-7/+10
2009-04-02Merge branch 'jc/maint-1.6.0-blame-s' into maintLibravatar Junio C Hamano1-4/+4
2009-04-02Merge branch 'js/maint-diff-temp-smudge' into maintLibravatar Junio C Hamano2-3/+26
2009-04-02Merge branch 'js/maint-1.6.0-exec-path-env' into maintLibravatar Junio C Hamano1-0/+4
2009-04-02Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maintLibravatar Junio C Hamano2-2/+2
2009-04-02Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maintLibravatar Junio C Hamano1-9/+12
2009-04-02Merge branch 'dm/maint-docco' into maintLibravatar Junio C Hamano10-230/+234
2009-04-01Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano1-1/+1
2009-04-01Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-1/+1
2009-04-01Documentation: Remove an odd "instead"Libravatar Holger Weiß1-1/+1
2009-04-01fix portability problem with IS_RUN_COMMAND_ERRLibravatar Jeff King1-1/+1
2009-04-01mailmap: resurrect lower-casing of email addressesLibravatar Johannes Schindelin1-0/+9
2009-03-30Update draft release notes to 1.6.2.2Libravatar Junio C Hamano1-1/+8
2009-03-30Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano3-6/+7
2009-03-30Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano3-6/+12
2009-03-30Fix bash completion in path with spacesLibravatar Daniel Cheng (aka SDiZ)1-2/+2
2009-03-30bash completion: only show 'log --merge' if mergingLibravatar Thomas Rast1-1/+6
2009-03-30git-tag(1): add hint about commit messagesLibravatar Nico -telmich- Schottelius1-0/+1
2009-03-30Documentation: update graph api example.Libravatar Allan Caffee1-4/+4
2009-03-29Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano1-1/+2
2009-03-29Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-1/+2
2009-03-29git-svn: fix ls-tree usage with dash-prefixed pathsLibravatar Eric Wong1-6/+9
2009-03-29import-zips: fix thinkoLibravatar Johannes Schindelin1-1/+2
2009-03-28Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano3-11/+3
2009-03-28test-lib: Clean up comments and Makefile.Libravatar Emil Sit2-9/+1
2009-03-27Documentation: format-patch --root clarificationsLibravatar Thomas Rast1-9/+12
2009-03-26documentation: update cvsimport description of "-r" for recent cloneLibravatar Carlo Marcelo Arenas Belon1-1/+1
2009-03-25Documentation: Remove spurious uses of "you" in git-bisect.txt.Libravatar David J. Mellor1-3/+3
2009-03-25diff --no-index: Do not generate patch output if other output is requestedLibravatar Johannes Sixt1-2/+2
2009-03-24Increase the size of the die/warning buffer to avoid truncationLibravatar Shawn O. Pearce1-1/+1
2009-03-24Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano2-2/+2
2009-03-24Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano2-2/+2
2009-03-24close_sha1_file(): make it easier to diagnose errorsLibravatar Linus Torvalds1-1/+1
2009-03-24avoid possible overflow in delta size filtering computationLibravatar Nicolas Pitre1-1/+1
2009-03-22Documentation: minor grammatical fix in git-check-ref-format.txtLibravatar David J. Mellor1-20/+20
2009-03-22Documentation: minor grammatical fixes in git-check-attr.txtLibravatar David J. Mellor1-8/+8
2009-03-22Documentation: minor grammatical fixes in git-cat-file.txtLibravatar David J. Mellor1-9/+9
2009-03-22Documentation: minor grammatical fixes and rewording in git-bundle.txtLibravatar David J. Mellor1-43/+43
2009-03-22Documentation: remove some uses of the passive voice in git-bisect.txtLibravatar David J. Mellor1-11/+11
2009-03-22Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano1-1/+1
2009-03-22Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-1/+1
2009-03-22Smudge the files fed to external diff and textconvLibravatar Johannes Schindelin2-3/+26
2009-03-22everyday: use the dashless form of git-initLibravatar David Aguilar1-1/+1
2009-03-21Update draft release notes to 1.6.2.2Libravatar Junio C Hamano2-1/+36
2009-03-21ls-files: require worktree when --deleted is givenLibravatar Jeff King1-0/+1
2009-03-21pickaxe: count regex matches only onceLibravatar René Scharfe1-2/+4
2009-03-21Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano0-0/+0