summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-10-19Fix mismerge at cdb22c4 in builtin-checkout.cLibravatar Junio C Hamano1-3/+0
2008-10-19git-merge-recursive: honor merge.conflictstyle once againLibravatar Matt McCutchen1-1/+1
2008-10-19Documentation: Spelling fixLibravatar Fredrik Skolmli1-1/+1
2008-10-19Merge branch 'pb/rename-rowin32'Libravatar Junio C Hamano1-2/+3
2008-10-18Update draft release notes for 1.6.1Libravatar Junio C Hamano1-1/+6
2008-10-18Merge branch 'maint'Libravatar Junio C Hamano4-10/+23
2008-10-18Hopefully the final draft release notes update before 1.6.0.3Libravatar Junio C Hamano1-1/+9
2008-10-18diff(1): clarify what "T"ypechange status meansLibravatar Junio C Hamano1-1/+2
2008-10-18Merge branch 'db/maint-checkout-b' into maintLibravatar Junio C Hamano2-0/+22
2008-10-18Do not rename read-only files during a pushLibravatar Petr Baudis1-2/+3
2008-10-18Merge branch 'pb/commit-where'Libravatar Junio C Hamano2-8/+22
2008-10-18contrib: update packinfo.pl to not use dashed commandsLibravatar Dan McGee1-7/+7
2008-10-18force_object_loose: Fix memory leakLibravatar Björn Steinbrink1-1/+5
2008-10-17tests: shell negation portability fixLibravatar Jeff King1-1/+1
2008-10-17Merge branch 'maint'Libravatar Junio C Hamano7-6/+101
2008-10-16t1301-shared-repo.sh: don't let a default ACL interfere with the testLibravatar Matt McCutchen1-0/+3
2008-10-16git-check-attr(1): add output and example sectionsLibravatar Jonas Fonseca1-0/+50
2008-10-16xdiff-interface.c: strip newline (and cr) from line before pattern matchingLibravatar Brandon Casey2-2/+12
2008-10-16t4018-diff-funcname: demonstrate end of line funcname matching flawLibravatar Brandon Casey1-0/+6
2008-10-16t4018-diff-funcname: rework negated last expression testLibravatar Brandon Casey1-1/+2
2008-10-16Typo "does not exists" when git remote update remote.Libravatar Mikael Magnusson1-1/+1
2008-10-14remote.c: correct the check for a leading '/' in a remote nameLibravatar Brandon Casey1-4/+5
2008-10-14Add testcase to ensure merging an early part of a branch is done properlyLibravatar Miklos Vajna1-0/+26
2008-10-14Add Linux PPC support to the pre-auto-gc example hookLibravatar Miklos Vajna1-0/+3
2008-10-14t4018-diff-funcname: add objective-c xfuncname pattern to syntax testLibravatar Brandon Casey1-1/+1
2008-10-13Update draft release notes to 1.6.1Libravatar Junio C Hamano1-7/+46
2008-10-13Merge branch 'maint'Libravatar Junio C Hamano1-2/+19
2008-10-13Update draft release notes to 1.6.0.3Libravatar Junio C Hamano1-2/+19
2008-10-13tests: shell negation portability fixLibravatar Jeff King1-1/+1
2008-10-12Merge branch 'maint'Libravatar Shawn O. Pearce3-1/+60
2008-10-12test-lib: fix broken printfLibravatar Shawn O. Pearce1-1/+1
2008-10-12"git diff <tree>{3,}": do not reverse order of argumentsLibravatar Matt McCutchen3-3/+31
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerLibravatar Brandon Casey46-197/+91
2008-10-12print an error message for invalid pathLibravatar Dmitry Potapov2-3/+5
2008-10-12Documentation: remove stale howto/rebase-and-edit.txtLibravatar Thomas Rast1-79/+0
2008-10-12t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'Libravatar Brandon Casey1-1/+1
2008-10-12git apply --directory broken for new filesLibravatar Jeff King2-0/+59
2008-10-10Merge branch 'maint'Libravatar Shawn O. Pearce6-8/+29
2008-10-10rebase -i: do not fail when there is no commit to cherry-pickLibravatar Johannes Schindelin2-1/+13
2008-10-10test-lib: fix color reset in say_color()Libravatar Miklos Vajna1-1/+2
2008-10-10fix pread()'s short read in index-packLibravatar Nicolas Pitre3-6/+14
2008-10-09Merge branch 'js/objc-funchdr'Libravatar Shawn O. Pearce2-0/+12
2008-10-09Merge branch 'pb/gitweb'Libravatar Shawn O. Pearce2-31/+187
2008-10-09Merge branch 'dm/svn-branch'Libravatar Shawn O. Pearce3-2/+128
2008-10-09Merge branch 'bc/xdiffnl'Libravatar Shawn O. Pearce1-1/+11
2008-10-09Merge branch 'dp/cywginstat'Libravatar Shawn O. Pearce9-38/+194
2008-10-09Merge branch 'lt/time-reject-fractional-seconds'Libravatar Shawn O. Pearce1-6/+20
2008-10-09Merge branch 'jc/add-ita'Libravatar Shawn O. Pearce4-6/+65
2008-10-09Merge branch 'mw/sendemail'Libravatar Shawn O. Pearce3-215/+147
2008-10-09Merge branch 'mv/merge-refresh'Libravatar Shawn O. Pearce2-0/+19