aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2010-03-29
|\
| * format-patch: Squelch 'fatal: Not a range." errorKevin Ballard2010-03-29
| * Merge branch 'cp/add-u-pathspec' into maintJunio C Hamano2010-03-28
| |\
* | \ Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-28
|\ \ \
| * | | cherry-pick: add tests for new --ff optionChristian Couder2010-03-06
* | | | Merge branch 'sb/notes-parse-opt'Junio C Hamano2010-03-28
|\ \ \ \
| * | | | notes: rework subcommands and parse optionsStephen Boyd2010-03-12
* | | | | rebase -i: make post-rewrite work for 'edit'Thomas Rast2010-03-28
* | | | | Merge branch 'maint'Junio C Hamano2010-03-28
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | t9350: fix careless use of "cd"Junio C Hamano2010-03-28
| * | | | difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar2010-03-28
| * | | | Merge branch 'jc/color-attrs' into maintJunio C Hamano2010-03-24
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/maint-add-ignored-dir' into maintJunio C Hamano2010-03-24
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bg/apply-fix-blank-at-eof' into maintJunio C Hamano2010-03-24
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'tr/notes-display'Junio C Hamano2010-03-24
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | commit --amend: copy notes to the new commitThomas Rast2010-03-12
| * | | | | | | rebase: support automatic notes copyingThomas Rast2010-03-12
| * | | | | | | notes: implement helpers needed for note copying during rewriteThomas Rast2010-03-12
| * | | | | | | notes: implement 'git notes copy --stdin'Thomas Rast2010-03-12
| * | | | | | | rebase -i: invoke post-rewrite hookThomas Rast2010-03-12
| * | | | | | | rebase: invoke post-rewrite hookThomas Rast2010-03-12
| * | | | | | | commit --amend: invoke post-rewrite hookThomas Rast2010-03-12
| * | | | | | | Support showing notes from more than one notes treeThomas Rast2010-03-12
| * | | | | | | test-lib: unset GIT_NOTES_REF to stop it from influencing testsThomas Rast2010-03-12
| * | | | | | | Merge branch 'il/rev-glob'Junio C Hamano2010-02-23
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-13
| * | | | | | | | | git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann2010-03-12
| * | | | | | | | | git status: Show detailed dirty status of submodules in long formatJens Lehmann2010-03-08
| * | | | | | | | | git diff --submodule: Show detailed dirty status of submodulesJens Lehmann2010-03-04
* | | | | | | | | | Merge branch 'pb/log-first-parent-p-m'Junio C Hamano2010-03-24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | show --first-parent/-m: do not default to --ccJunio C Hamano2010-03-09
| * | | | | | | | | | show -c: show patch textJunio C Hamano2010-03-09
| * | | | | | | | | | t4013: add tests for log -p -m --first-parentJunio C Hamano2010-03-09
* | | | | | | | | | | Merge branch 'jc/maint-refs-dangling'Junio C Hamano2010-03-24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | refs: ref entry with NULL sha1 is can be a dangling symrefJunio C Hamano2010-03-15
* | | | | | | | | | | | Merge branch 'jk/maint-add-ignored-dir'Junio C Hamano2010-03-20
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | tests for "git add ignored-dir/file" without -fJunio C Hamano2010-03-13
| * | | | | | | | | | | t0050: mark non-working test as suchJunio C Hamano2010-03-13
* | | | | | | | | | | | Merge branch 'jc/color-attrs'Junio C Hamano2010-03-20
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | color: allow multiple attributesJunio C Hamano2010-03-07
* | | | | | | | | | | | Merge branch 'cc/reset-keep'Junio C Hamano2010-03-20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | reset: disallow using --keep when there are unmerged entriesChristian Couder2010-03-06
| * | | | | | | | | | | | reset: disallow "reset --keep" outside a work treeChristian Couder2010-03-06
| * | | | | | | | | | | | reset: add test cases for "--keep" optionChristian Couder2010-01-24
* | | | | | | | | | | | | Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano2010-03-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | t3417: Add test cases for "rebase --whitespace=fix"Björn Gustavsson2010-03-06
| * | | | | | | | | | | | t4124: Add additional tests of --whitespace=fixBjörn Gustavsson2010-03-06
| * | | | | | | | | | | | apply: Remove the quick rejection testBjörn Gustavsson2010-03-06
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-20
|\ \ \ \ \ \ \ \ \ \ \ \