summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-03-20xdl_merge(): add optional ancestor label to diff3-style outputLibravatar Jonathan Nieder2-2/+15
2010-03-20tests: document cherry-pick behavior in face of conflictsLibravatar Jonathan Nieder1-0/+198
2010-03-20tests: document format of conflicts from checkout -mLibravatar Jonathan Nieder1-4/+61
2010-03-20Update draft release notes to 1.7.1Libravatar Junio C Hamano1-2/+34
2010-03-20Merge branch 'jk/maint-add-ignored-dir'Libravatar Junio C Hamano3-4/+103
2010-03-20Merge branch 'ml/color-grep'Libravatar Junio C Hamano6-43/+123
2010-03-20Merge branch 'jc/color-attrs'Libravatar Junio C Hamano3-14/+41
2010-03-20Merge branch 'cc/reset-keep'Libravatar Junio C Hamano5-20/+229
2010-03-20Merge branch 'fl/askpass'Libravatar Junio C Hamano5-13/+58
2010-03-20Merge branch 'bg/apply-fix-blank-at-eof'Libravatar Junio C Hamano4-40/+450
2010-03-20Merge branch 'bw/union-merge-refactor'Libravatar Junio C Hamano6-79/+92
2010-03-20Merge branch 'maint'Libravatar Junio C Hamano5-9/+20
2010-03-20Update draft release notes to 1.7.0.3Libravatar Junio C Hamano1-1/+7
2010-03-20fetch: Fix minor memory leakLibravatar Andreas Gruenbacher1-2/+3
2010-03-20fetch: Future-proof initialization of a refspec on stackLibravatar Andreas Gruenbacher1-3/+1
2010-03-20fetch: Check for a "^{}" suffix with suffixcmp()Libravatar Andreas Gruenbacher1-1/+1
2010-03-20Fix a spelling mistake in a git-p4 console messageLibravatar Benjamin C Meyer1-1/+1
2010-03-20Use test_expect_success for test setupsLibravatar Brian Gernhardt5-61/+70
2010-03-20daemon: parse_host_and_port SIGSEGV if port is specifiedLibravatar Imre Deak1-1/+1
2010-03-20Makefile: Fix occasional GIT-CFLAGS breakageLibravatar Jonathan Nieder1-10/+11
2010-03-20Makefile: Fix CDPATH problemLibravatar Jonathan Nieder1-0/+6
2010-03-20notes.c: remove inappropriate call to returnLibravatar Brandon Casey1-1/+1
2010-03-20pull: replace unnecessary sed invocationLibravatar Stephen Boyd1-1/+1
2010-03-17Merge branch 'maint'Libravatar Junio C Hamano2-2/+4
2010-03-17Documentation: receive.denyCurrentBranch defaults to 'refuse'Libravatar Thomas Rast1-1/+1
2010-03-17bash: complete *_HEAD refs if presentLibravatar Ian Ward Comfort1-1/+3
2010-03-16Merge branch 'maint'Libravatar Junio C Hamano1-22/+24
2010-03-15Documentation/git-read-tree: clarify 2-tree mergeLibravatar Michael J Gruber1-13/+15
2010-03-15Documentation/git-read-tree: fix table layoutLibravatar Michael J Gruber1-10/+10
2010-03-15Merge branch 'sd/format-patch-to'Libravatar Junio C Hamano5-46/+197
2010-03-15Merge branch 'tc/http-cleanup'Libravatar Junio C Hamano8-39/+66
2010-03-15Merge branch 'tc/transport-verbosity'Libravatar Junio C Hamano12-41/+92
2010-03-15Merge branch 'ld/push-porcelain'Libravatar Junio C Hamano5-9/+67
2010-03-15Merge branch 'jh/notes'Libravatar Junio C Hamano14-196/+2167
2010-03-13tests for "git add ignored-dir/file" without -fLibravatar Junio C Hamano1-0/+79
2010-03-13dir: fix COLLECT_IGNORED on excluded prefixesLibravatar Jeff King1-2/+18
2010-03-13t0050: mark non-working test as suchLibravatar Junio C Hamano1-2/+6
2010-03-13Merge branch 'maint'Libravatar Junio C Hamano6-14/+47
2010-03-13don't use default revision if a rev was specifiedLibravatar Dave Olszewski2-2/+13
2010-03-13for_each_recent_reflog_ent(): use strbuf, fix offset handlingLibravatar René Scharfe1-10/+12
2010-03-13t/Makefile: remove test artifacts upon "make clean"Libravatar Junio C Hamano1-0/+2
2010-03-13blame: fix indent of line numbersLibravatar René Scharfe2-2/+20
2010-03-13Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano3-2/+4
2010-03-13t9150,t9151: Add rewrite-root option to initLibravatar Tuomas Suutari2-0/+2
2010-03-13git-svn: Fix merge detecting with rewrite-rootLibravatar Tuomas Suutari1-2/+2
2010-03-12Merge branch 'maint'Libravatar Junio C Hamano1-12/+12
2010-03-11t5516: Use test_cmp when appropriateLibravatar Junio C Hamano1-3/+3
2010-03-11t9400: Use test_cmp when appropriateLibravatar Junio C Hamano1-12/+12
2010-03-10Merge branch 'sd/init-template'Libravatar Junio C Hamano6-12/+67
2010-03-10Merge branch 'sh/am-keep-cr'Libravatar Junio C Hamano6-10/+141