summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-03-24Teach rebase the --no-ff option.Libravatar Marc Branchaud1-4/+32
2010-03-21rev-list: fix --pretty=oneline with empty messageLibravatar Erik Faye-Lund1-0/+9
2010-03-20cherry-pick, revert: add a label for ancestorLibravatar Jonathan Nieder1-2/+2
2010-03-20revert: clarify label on conflict hunksLibravatar Jonathan Nieder1-2/+2
2010-03-20checkout -m --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder1-1/+1
2010-03-20checkout --conflict=diff3: add a label for ancestorLibravatar Jonathan Nieder1-2/+2
2010-03-20merge-file --diff3: add a label for ancestorLibravatar Jonathan Nieder1-2/+2
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-20Merge branch 'jk/maint-add-ignored-dir'Libravatar Junio C Hamano2-2/+85
2010-03-20Merge branch 'jc/color-attrs'Libravatar Junio C Hamano1-4/+11
2010-03-20Merge branch 'cc/reset-keep'Libravatar Junio C Hamano3-10/+139
2010-03-20Merge branch 'bg/apply-fix-blank-at-eof'Libravatar Junio C Hamano3-0/+305
2010-03-20Merge branch 'bw/union-merge-refactor'Libravatar Junio C Hamano1-0/+37
2010-03-20Use test_expect_success for test setupsLibravatar Brian Gernhardt5-61/+70
2010-03-20t/t5505-remote.sh: escape * to prevent interpretation by shell as globLibravatar Brandon Casey1-1/+1
2010-03-20t5505: add missing &&Libravatar Brandon Casey1-1/+1
2010-03-20t5505: remove unnecessary subshell invocationsLibravatar Brandon Casey1-39/+4
2010-03-16t/t1304: make a second colon optional in the mask ACL checkLibravatar Brandon Casey1-1/+1
2010-03-16t/t1304: set the ACL effective rights maskLibravatar Brandon Casey1-0/+1
2010-03-16t/t1304: use 'test -r' to test readability rather than looking at mode bitsLibravatar Brandon Casey1-14/+1
2010-03-16t/t1304: set the Default ACL base entriesLibravatar Brandon Casey1-0/+1
2010-03-16t/t1304: avoid -d option to setfaclLibravatar Brandon Casey1-2/+2
2010-03-15refs: ref entry with NULL sha1 is can be a dangling symrefLibravatar Junio C Hamano1-3/+3
2010-03-15Merge branch 'sd/format-patch-to'Libravatar Junio C Hamano2-0/+118
2010-03-15Merge branch 'tc/http-cleanup'Libravatar Junio C Hamano3-20/+34
2010-03-15Merge branch 'ld/push-porcelain'Libravatar Junio C Hamano1-0/+50
2010-03-15Merge branch 'jh/notes'Libravatar Junio C Hamano5-48/+715
2010-03-14rebase--interactive: don't require what's rebased to be a branchLibravatar Dave Olszewski1-0/+9
2010-03-13tests for "git add ignored-dir/file" without -fLibravatar Junio C Hamano1-0/+79
2010-03-13t0050: mark non-working test as suchLibravatar Junio C Hamano1-2/+6
2010-03-13git status: ignoring untracked files must apply to submodules tooLibravatar Jens Lehmann1-0/+5
2010-03-13Merge branch 'maint'Libravatar Junio C Hamano3-1/+30
2010-03-13don't use default revision if a rev was specifiedLibravatar Dave Olszewski1-0/+9
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é Scharfe1-1/+19
2010-03-13Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano2-0/+2
2010-03-13t9150,t9151: Add rewrite-root option to initLibravatar Tuomas Suutari2-0/+2
2010-03-12git status: Fix false positive "new commits" output for dirty submodulesLibravatar Jens Lehmann1-3/+81
2010-03-12Merge branch 'maint'Libravatar Junio C Hamano1-12/+12
2010-03-12notes: rework subcommands and parse optionsLibravatar Stephen Boyd1-0/+11
2010-03-12commit --amend: copy notes to the new commitLibravatar Thomas Rast1-0/+12
2010-03-12rebase: support automatic notes copyingLibravatar Thomas Rast2-0/+41
2010-03-12notes: implement helpers needed for note copying during rewriteLibravatar Thomas Rast2-0/+197
2010-03-12notes: implement 'git notes copy --stdin'Libravatar Thomas Rast1-0/+34
2010-03-12rebase -i: invoke post-rewrite hookLibravatar Thomas Rast1-0/+101
2010-03-12rebase: invoke post-rewrite hookLibravatar Thomas Rast1-0/+30
2010-03-12commit --amend: invoke post-rewrite hookLibravatar Thomas Rast1-0/+52
2010-03-12Support showing notes from more than one notes treeLibravatar Thomas Rast2-8/+141
2010-03-12test-lib: unset GIT_NOTES_REF to stop it from influencing testsLibravatar Thomas Rast1-0/+1