summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-171-1/+1
| * t/t1304: set the ACL effective rights maskBrandon Casey2010-03-171-0/+1
| * t/t1304: use 'test -r' to test readability rather than looking at mode bitsBrandon Casey2010-03-171-14/+1
| * t/t1304: set the Default ACL base entriesBrandon Casey2010-03-171-0/+1
| * t/t1304: avoid -d option to setfaclBrandon Casey2010-03-171-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-151-0/+9
* | | Merge branch 'maint'Junio C Hamano2010-03-301-0/+4
|\ \ \
| * | | format-patch: Squelch 'fatal: Not a range." errorKevin Ballard2010-03-301-0/+4
| * | | Merge branch 'cp/add-u-pathspec' into maintJunio C Hamano2010-03-292-0/+10
| |\ \ \
* | \ \ \ Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-291-0/+98
|\ \ \ \ \
| * | | | | cherry-pick: add tests for new --ff optionChristian Couder2010-03-071-0/+98
* | | | | | Merge branch 'sb/notes-parse-opt'Junio C Hamano2010-03-291-0/+11
|\ \ \ \ \ \
| * | | | | | notes: rework subcommands and parse optionsStephen Boyd2010-03-131-0/+11
* | | | | | | rebase -i: make post-rewrite work for 'edit'Thomas Rast2010-03-291-0/+16
* | | | | | | Merge branch 'maint'Junio C Hamano2010-03-292-33/+47
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | t9350: fix careless use of "cd"Junio C Hamano2010-03-291-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-251-4/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/maint-add-ignored-dir' into maintJunio C Hamano2010-03-252-2/+85
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'bg/apply-fix-blank-at-eof' into maintJunio C Hamano2010-03-253-0/+305
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'tr/notes-display'Junio C Hamano2010-03-256-8/+609
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | commit --amend: copy notes to the new commitThomas Rast2010-03-131-0/+12
| * | | | | | | | | rebase: support automatic notes copyingThomas Rast2010-03-132-0/+41
| * | | | | | | | | notes: implement helpers needed for note copying during rewriteThomas Rast2010-03-132-0/+197
| * | | | | | | | | notes: implement 'git notes copy --stdin'Thomas Rast2010-03-131-0/+34
| * | | | | | | | | rebase -i: invoke post-rewrite hookThomas Rast2010-03-131-0/+101
| * | | | | | | | | rebase: invoke post-rewrite hookThomas Rast2010-03-131-0/+30
| * | | | | | | | | commit --amend: invoke post-rewrite hookThomas Rast2010-03-131-0/+52
| * | | | | | | | | Support showing notes from more than one notes treeThomas Rast2010-03-132-8/+141
| * | | | | | | | | test-lib: unset GIT_NOTES_REF to stop it from influencing testsThomas Rast2010-03-131-0/+1
| * | | | | | | | | Merge branch 'il/rev-glob'Junio C Hamano2010-02-231-0/+195
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-252-9/+97
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-141-0/+5
| * | | | | | | | | | | git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann2010-03-131-3/+81
| * | | | | | | | | | | git status: Show detailed dirty status of submodules in long formatJens Lehmann2010-03-091-3/+3
| * | | | | | | | | | | git diff --submodule: Show detailed dirty status of submodulesJens Lehmann2010-03-051-6/+11
* | | | | | | | | | | | Merge branch 'pb/log-first-parent-p-m'Junio C Hamano2010-03-257-0/+543
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | show --first-parent/-m: do not default to --ccJunio C Hamano2010-03-093-0/+125
| * | | | | | | | | | | | show -c: show patch textJunio C Hamano2010-03-092-0/+37
| * | | | | | | | | | | | t4013: add tests for log -p -m --first-parentJunio C Hamano2010-03-094-0/+381
* | | | | | | | | | | | | Merge branch 'jc/maint-refs-dangling'Junio C Hamano2010-03-251-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | refs: ref entry with NULL sha1 is can be a dangling symrefJunio C Hamano2010-03-161-3/+3
* | | | | | | | | | | | | | Merge branch 'jk/maint-add-ignored-dir'Junio C Hamano2010-03-202-2/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | tests for "git add ignored-dir/file" without -fJunio C Hamano2010-03-141-0/+79
| * | | | | | | | | | | | | t0050: mark non-working test as suchJunio C Hamano2010-03-141-2/+6
* | | | | | | | | | | | | | Merge branch 'jc/color-attrs'Junio C Hamano2010-03-201-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | color: allow multiple attributesJunio C Hamano2010-03-071-4/+11
* | | | | | | | | | | | | | Merge branch 'cc/reset-keep'Junio C Hamano2010-03-203-10/+139
|\ \ \ \ \ \ \ \ \ \ \ \ \ \