summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ef/maint-empty-commit-log'Junio C Hamano2010-04-061-0/+9
|\
| * rev-list: fix --pretty=oneline with empty messageErik Faye-Lund2010-03-211-0/+9
* | Merge branch 'mb/rebase-i-no-ff'Junio C Hamano2010-04-031-4/+32
|\ \
| * | Teach rebase the --no-ff option.Marc Branchaud2010-03-241-4/+32
* | | Merge branch 'jn/merge-diff3-label'Junio C Hamano2010-04-033-8/+263
|\ \ \
| * | | cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-201-2/+2
| * | | revert: clarify label on conflict hunksJonathan Nieder2010-03-201-2/+2
| * | | checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-201-1/+1
| * | | checkout --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-201-2/+2
| * | | merge-file --diff3: add a label for ancestorJonathan Nieder2010-03-201-2/+2
| * | | tests: document cherry-pick behavior in face of conflictsJonathan Nieder2010-03-201-0/+198
| * | | tests: document format of conflicts from checkout -mJonathan Nieder2010-03-201-4/+61
* | | | Merge branch 'bc/t5505-fix'Junio C Hamano2010-04-031-41/+6
|\ \ \ \
| * | | | t/t5505-remote.sh: escape * to prevent interpretation by shell as globBrandon Casey2010-03-201-1/+1
| * | | | t5505: add missing &&Brandon Casey2010-03-201-1/+1
| * | | | t5505: remove unnecessary subshell invocationsBrandon Casey2010-03-201-39/+4
| | |/ / | |/| |
* | | | Merge branch 'bc/acl-test'Junio C Hamano2010-04-031-17/+6
|\ \ \ \
| * | | | t/t1304: make a second colon optional in the mask ACL checkBrandon Casey2010-03-161-1/+1
| * | | | t/t1304: set the ACL effective rights maskBrandon Casey2010-03-161-0/+1
| * | | | t/t1304: use 'test -r' to test readability rather than looking at mode bitsBrandon Casey2010-03-161-14/+1
| * | | | t/t1304: set the Default ACL base entriesBrandon Casey2010-03-161-0/+1
| * | | | t/t1304: avoid -d option to setfaclBrandon Casey2010-03-161-2/+2
| |/ / /
* | | | Merge branch 'do/rebase-i-arbitrary'Junio C Hamano2010-04-031-0/+9
|\ \ \ \
| * | | | rebase--interactive: don't require what's rebased to be a branchDave Olszewski2010-03-141-0/+9
* | | | | Merge branch 'maint'Junio C Hamano2010-03-291-0/+4
|\ \ \ \ \
| * | | | | format-patch: Squelch 'fatal: Not a range." errorKevin Ballard2010-03-291-0/+4
| * | | | | Merge branch 'cp/add-u-pathspec' into maintJunio C Hamano2010-03-282-0/+10
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-281-0/+98
|\ \ \ \ \ \ \
| * | | | | | | cherry-pick: add tests for new --ff optionChristian Couder2010-03-061-0/+98
* | | | | | | | Merge branch 'sb/notes-parse-opt'Junio C Hamano2010-03-281-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | notes: rework subcommands and parse optionsStephen Boyd2010-03-121-0/+11
* | | | | | | | | rebase -i: make post-rewrite work for 'edit'Thomas Rast2010-03-281-0/+16
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-03-282-33/+47
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | t9350: fix careless use of "cd"Junio C Hamano2010-03-281-33/+38
| * | | | | | | | difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar2010-03-281-0/+9
| * | | | | | | | Merge branch 'jc/color-attrs' into maintJunio C Hamano2010-03-241-4/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/maint-add-ignored-dir' into maintJunio C Hamano2010-03-242-2/+85
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bg/apply-fix-blank-at-eof' into maintJunio C Hamano2010-03-243-0/+305
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tr/notes-display'Junio C Hamano2010-03-246-8/+609
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | commit --amend: copy notes to the new commitThomas Rast2010-03-121-0/+12
| * | | | | | | | | | rebase: support automatic notes copyingThomas Rast2010-03-122-0/+41
| * | | | | | | | | | notes: implement helpers needed for note copying during rewriteThomas Rast2010-03-122-0/+197
| * | | | | | | | | | notes: implement 'git notes copy --stdin'Thomas Rast2010-03-121-0/+34
| * | | | | | | | | | rebase -i: invoke post-rewrite hookThomas Rast2010-03-121-0/+101
| * | | | | | | | | | rebase: invoke post-rewrite hookThomas Rast2010-03-121-0/+30
| * | | | | | | | | | commit --amend: invoke post-rewrite hookThomas Rast2010-03-121-0/+52
| * | | | | | | | | | Support showing notes from more than one notes treeThomas Rast2010-03-122-8/+141
| * | | | | | | | | | test-lib: unset GIT_NOTES_REF to stop it from influencing testsThomas Rast2010-03-121-0/+1
| * | | | | | | | | | Merge branch 'il/rev-glob'Junio C Hamano2010-02-231-0/+195
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-242-9/+97
|\ \ \ \ \ \ \ \ \ \ \ \