Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ef/maint-empty-commit-log' | Junio C Hamano | 2010-04-06 | 1 | -0/+9 |
|\ | |||||
| * | rev-list: fix --pretty=oneline with empty message | Erik Faye-Lund | 2010-03-21 | 1 | -0/+9 |
* | | Merge branch 'mb/rebase-i-no-ff' | Junio C Hamano | 2010-04-03 | 1 | -4/+32 |
|\ \ | |||||
| * | | Teach rebase the --no-ff option. | Marc Branchaud | 2010-03-24 | 1 | -4/+32 |
* | | | Merge branch 'jn/merge-diff3-label' | Junio C Hamano | 2010-04-03 | 3 | -8/+263 |
|\ \ \ | |||||
| * | | | cherry-pick, revert: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -2/+2 |
| * | | | revert: clarify label on conflict hunks | Jonathan Nieder | 2010-03-20 | 1 | -2/+2 |
| * | | | checkout -m --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -1/+1 |
| * | | | checkout --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -2/+2 |
| * | | | merge-file --diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -2/+2 |
| * | | | tests: document cherry-pick behavior in face of conflicts | Jonathan Nieder | 2010-03-20 | 1 | -0/+198 |
| * | | | tests: document format of conflicts from checkout -m | Jonathan Nieder | 2010-03-20 | 1 | -4/+61 |
* | | | | Merge branch 'bc/t5505-fix' | Junio C Hamano | 2010-04-03 | 1 | -41/+6 |
|\ \ \ \ | |||||
| * | | | | t/t5505-remote.sh: escape * to prevent interpretation by shell as glob | Brandon Casey | 2010-03-20 | 1 | -1/+1 |
| * | | | | t5505: add missing && | Brandon Casey | 2010-03-20 | 1 | -1/+1 |
| * | | | | t5505: remove unnecessary subshell invocations | Brandon Casey | 2010-03-20 | 1 | -39/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'bc/acl-test' | Junio C Hamano | 2010-04-03 | 1 | -17/+6 |
|\ \ \ \ | |||||
| * | | | | t/t1304: make a second colon optional in the mask ACL check | Brandon Casey | 2010-03-16 | 1 | -1/+1 |
| * | | | | t/t1304: set the ACL effective rights mask | Brandon Casey | 2010-03-16 | 1 | -0/+1 |
| * | | | | t/t1304: use 'test -r' to test readability rather than looking at mode bits | Brandon Casey | 2010-03-16 | 1 | -14/+1 |
| * | | | | t/t1304: set the Default ACL base entries | Brandon Casey | 2010-03-16 | 1 | -0/+1 |
| * | | | | t/t1304: avoid -d option to setfacl | Brandon Casey | 2010-03-16 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge branch 'do/rebase-i-arbitrary' | Junio C Hamano | 2010-04-03 | 1 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | rebase--interactive: don't require what's rebased to be a branch | Dave Olszewski | 2010-03-14 | 1 | -0/+9 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-29 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | format-patch: Squelch 'fatal: Not a range." error | Kevin Ballard | 2010-03-29 | 1 | -0/+4 |
| * | | | | | Merge branch 'cp/add-u-pathspec' into maint | Junio C Hamano | 2010-03-28 | 2 | -0/+10 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 | 1 | -0/+98 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cherry-pick: add tests for new --ff option | Christian Couder | 2010-03-06 | 1 | -0/+98 |
* | | | | | | | | Merge branch 'sb/notes-parse-opt' | Junio C Hamano | 2010-03-28 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | notes: rework subcommands and parse options | Stephen Boyd | 2010-03-12 | 1 | -0/+11 |
* | | | | | | | | | rebase -i: make post-rewrite work for 'edit' | Thomas Rast | 2010-03-28 | 1 | -0/+16 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-28 | 2 | -33/+47 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | t9350: fix careless use of "cd" | Junio C Hamano | 2010-03-28 | 1 | -33/+38 |
| * | | | | | | | | difftool: Fix '--gui' when diff.guitool is unconfigured | David Aguilar | 2010-03-28 | 1 | -0/+9 |
| * | | | | | | | | Merge branch 'jc/color-attrs' into maint | Junio C Hamano | 2010-03-24 | 1 | -4/+11 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-add-ignored-dir' into maint | Junio C Hamano | 2010-03-24 | 2 | -2/+85 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'bg/apply-fix-blank-at-eof' into maint | Junio C Hamano | 2010-03-24 | 3 | -0/+305 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 | 6 | -8/+609 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | commit --amend: copy notes to the new commit | Thomas Rast | 2010-03-12 | 1 | -0/+12 |
| * | | | | | | | | | | rebase: support automatic notes copying | Thomas Rast | 2010-03-12 | 2 | -0/+41 |
| * | | | | | | | | | | notes: implement helpers needed for note copying during rewrite | Thomas Rast | 2010-03-12 | 2 | -0/+197 |
| * | | | | | | | | | | notes: implement 'git notes copy --stdin' | Thomas Rast | 2010-03-12 | 1 | -0/+34 |
| * | | | | | | | | | | rebase -i: invoke post-rewrite hook | Thomas Rast | 2010-03-12 | 1 | -0/+101 |
| * | | | | | | | | | | rebase: invoke post-rewrite hook | Thomas Rast | 2010-03-12 | 1 | -0/+30 |
| * | | | | | | | | | | commit --amend: invoke post-rewrite hook | Thomas Rast | 2010-03-12 | 1 | -0/+52 |
| * | | | | | | | | | | Support showing notes from more than one notes tree | Thomas Rast | 2010-03-12 | 2 | -8/+141 |
| * | | | | | | | | | | test-lib: unset GIT_NOTES_REF to stop it from influencing tests | Thomas Rast | 2010-03-12 | 1 | -0/+1 |
| * | | | | | | | | | | Merge branch 'il/rev-glob' | Junio C Hamano | 2010-02-23 | 1 | -0/+195 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'jl/submodule-diff-dirtiness' | Junio C Hamano | 2010-03-24 | 2 | -9/+97 |
|\ \ \ \ \ \ \ \ \ \ \ \ |