Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git status: ignoring untracked files must apply to submodules too | Jens Lehmann | 2010-03-13 | 1 | -0/+5 |
| * | | | | | | | | | git status: Fix false positive "new commits" output for dirty submodules | Jens Lehmann | 2010-03-12 | 1 | -3/+81 |
| * | | | | | | | | | git status: Show detailed dirty status of submodules in long format | Jens Lehmann | 2010-03-08 | 1 | -3/+3 |
| * | | | | | | | | | git diff --submodule: Show detailed dirty status of submodules | Jens Lehmann | 2010-03-04 | 1 | -6/+11 |
* | | | | | | | | | | Merge branch 'pb/log-first-parent-p-m' | Junio C Hamano | 2010-03-24 | 7 | -0/+543 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | show --first-parent/-m: do not default to --cc | Junio C Hamano | 2010-03-09 | 3 | -0/+125 |
| * | | | | | | | | | | show -c: show patch text | Junio C Hamano | 2010-03-09 | 2 | -0/+37 |
| * | | | | | | | | | | t4013: add tests for log -p -m --first-parent | Junio C Hamano | 2010-03-09 | 4 | -0/+381 |
* | | | | | | | | | | | Merge branch 'jc/maint-refs-dangling' | Junio C Hamano | 2010-03-24 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | refs: ref entry with NULL sha1 is can be a dangling symref | Junio C Hamano | 2010-03-15 | 1 | -3/+3 |
* | | | | | | | | | | | | Merge branch 'jk/maint-add-ignored-dir' | Junio C Hamano | 2010-03-20 | 2 | -2/+85 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | tests for "git add ignored-dir/file" without -f | Junio C Hamano | 2010-03-13 | 1 | -0/+79 |
| * | | | | | | | | | | | t0050: mark non-working test as such | Junio C Hamano | 2010-03-13 | 1 | -2/+6 |
* | | | | | | | | | | | | Merge branch 'jc/color-attrs' | Junio C Hamano | 2010-03-20 | 1 | -4/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | color: allow multiple attributes | Junio C Hamano | 2010-03-07 | 1 | -4/+11 |
* | | | | | | | | | | | | Merge branch 'cc/reset-keep' | Junio C Hamano | 2010-03-20 | 3 | -10/+139 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | reset: disallow using --keep when there are unmerged entries | Christian Couder | 2010-03-06 | 2 | -15/+10 |
| * | | | | | | | | | | | | reset: disallow "reset --keep" outside a work tree | Christian Couder | 2010-03-06 | 1 | -8/+17 |
| * | | | | | | | | | | | | reset: add test cases for "--keep" option | Christian Couder | 2010-01-24 | 2 | -1/+126 |
* | | | | | | | | | | | | | Merge branch 'bg/apply-fix-blank-at-eof' | Junio C Hamano | 2010-03-20 | 3 | -0/+305 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | t3417: Add test cases for "rebase --whitespace=fix" | Björn Gustavsson | 2010-03-06 | 1 | -0/+126 |
| * | | | | | | | | | | | | t4124: Add additional tests of --whitespace=fix | Björn Gustavsson | 2010-03-06 | 1 | -0/+170 |
| * | | | | | | | | | | | | apply: Remove the quick rejection test | Björn Gustavsson | 2010-03-06 | 1 | -0/+9 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'bw/union-merge-refactor' | Junio C Hamano | 2010-03-20 | 1 | -0/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ |