Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2010-03-29 | 2 | -1/+12 |
|\ | |||||
| * | format-patch: Squelch 'fatal: Not a range." error | Kevin Ballard | 2010-03-29 | 2 | -1/+12 |
* | | Update draft release notes to 1.7.1 | Junio C Hamano | 2010-03-28 | 1 | -9/+10 |
* | | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 | 8 | -18/+168 |
|\ \ | |||||
| * | | revert: fix tiny memory leak in cherry-pick --ff | Jonathan Nieder | 2010-03-20 | 1 | -1/+2 |
| * | | rebase -i: use new --ff cherry-pick option | Christian Couder | 2010-03-20 | 1 | -12/+3 |
| * | | Documentation: describe new cherry-pick --ff option | Christian Couder | 2010-03-06 | 1 | -1/+5 |
| * | | cherry-pick: add tests for new --ff option | Christian Couder | 2010-03-06 | 1 | -0/+98 |
| * | | revert: add --ff option to allow fast forward when cherry-picking | Junio C Hamano | 2010-03-06 | 1 | -3/+40 |
| * | | builtin/merge: make checkout_fast_forward() non static | Junio C Hamano | 2010-03-06 | 2 | -1/+4 |
| * | | parse-options: add parse_options_concat() to concat options | Junio C Hamano | 2010-03-06 | 2 | -0/+16 |
* | | | Merge branch 'sb/notes-parse-opt' | Junio C Hamano | 2010-03-28 | 2 | -159/+382 |
|\ \ \ | |||||
| * | | | notes: rework subcommands and parse options | Stephen Boyd | 2010-03-12 | 2 | -166/+394 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-28 | 1 | -0/+19 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Prepare for 1.7.0.4 | Junio C Hamano | 2010-03-28 | 2 | -1/+20 |
| * | | | Merge branch 'cp/add-u-pathspec' into maint | Junio C Hamano | 2010-03-28 | 3 | -9/+39 |
| |\ \ \ | |||||
* | | | | | rebase -i: make post-rewrite work for 'edit' | Thomas Rast | 2010-03-28 | 2 | -2/+19 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-28 | 4 | -39/+55 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 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 | 2 | -5/+16 |
| * | | | | fast-export: don't segfault when marks file cannot be opened | Sverre Rabbelier | 2010-03-28 | 1 | -1/+1 |
* | | | | | imap-send: suppress warning about cleartext password with CRAM-MD5 | Chris Webb | 2010-03-28 | 1 | -3/+3 |
* | | | | | Merge branch 'jh/maint-submodule-status-in-void' | Junio C Hamano | 2010-03-24 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | git submodule summary: Handle HEAD as argument when on an unborn branch | Jens Lehmann | 2010-03-09 | 1 | -0/+1 |
| * | | | | | submodule summary: do not fail before the first commit | Junio C Hamano | 2010-03-03 | 1 | -1/+2 |
* | | | | | | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 | 25 | -33/+1366 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | git-notes(1): add a section about the meaning of history | Thomas Rast | 2010-03-12 | 1 | -0/+14 |
| * | | | | | notes: track whether notes_trees were changed at all | Thomas Rast | 2010-03-12 | 3 | -0/+6 |
| * | | | | | notes: add shorthand --ref to override GIT_NOTES_REF | Thomas Rast | 2010-03-12 | 2 | -0/+21 |
| * | | | | | commit --amend: copy notes to the new commit | Thomas Rast | 2010-03-12 | 2 | -0/+18 |
| * | | | | | rebase: support automatic notes copying | Thomas Rast | 2010-03-12 | 5 | -1/+50 |
| * | | | | | notes: implement helpers needed for note copying during rewrite | Thomas Rast | 2010-03-12 | 8 | -8/+385 |
| * | | | | | notes: implement 'git notes copy --stdin' | Thomas Rast | 2010-03-12 | 5 | -2/+127 |
| * | | | | | rebase -i: invoke post-rewrite hook | Thomas Rast | 2010-03-12 | 2 | -1/+146 |
| * | | | | | rebase: invoke post-rewrite hook | Thomas Rast | 2010-03-12 | 3 | -0/+45 |
| * | | | | | commit --amend: invoke post-rewrite hook | Thomas Rast | 2010-03-12 | 3 | -1/+92 |
| * | | | | | Documentation: document post-rewrite hook | Thomas Rast | 2010-03-12 | 1 | -0/+34 |
| * | | | | | Support showing notes from more than one notes tree | Thomas Rast | 2010-03-12 | 14 | -30/+437 |
| * | | | | | 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 | 9 | -19/+357 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'jl/submodule-diff-dirtiness' | Junio C Hamano | 2010-03-24 | 10 | -43/+221 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git status: ignoring untracked files must apply to submodules too | Jens Lehmann | 2010-03-13 | 6 | -4/+17 |
| * | | | | | | | git status: Fix false positive "new commits" output for dirty submodules | Jens Lehmann | 2010-03-12 | 3 | -9/+88 |
| * | | | | | | | Refactor dirty submodule detection in diff-lib.c | Jens Lehmann | 2010-03-12 | 2 | -18/+33 |
| * | | | | | | | git status: Show detailed dirty status of submodules in long format | Jens Lehmann | 2010-03-08 | 5 | -12/+46 |
| * | | | | | | | git diff --submodule: Show detailed dirty status of submodules | Jens Lehmann | 2010-03-04 | 5 | -21/+58 |
* | | | | | | | | Merge branch 'pb/log-first-parent-p-m' | Junio C Hamano | 2010-03-24 | 17 | -30/+653 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | show --first-parent/-m: do not default to --cc | Junio C Hamano | 2010-03-09 | 4 | -3/+134 |
| * | | | | | | | | show -c: show patch text | Junio C Hamano | 2010-03-09 | 6 | -8/+62 |
| * | | | | | | | | revision: introduce setup_revision_opt | Junio C Hamano | 2010-03-09 | 5 | -16/+44 |