| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'rh/ishes-doc' | Junio C Hamano | 2013-09-17 | 1 | -1/+1 |
|\ |
|
| * | use 'commit-ish' instead of 'committish' | Richard Hansen | 2013-09-04 | 1 | -1/+1 |
* | | Replace deprecated OPT_BOOLEAN by OPT_BOOL | Stefan Beller | 2013-08-05 | 1 | -6/+6 |
|/ |
|
* | Merge branch 'nd/const-struct-cache-entry' | Junio C Hamano | 2013-07-22 | 1 | -1/+1 |
|\ |
|
| * | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entry | Nguyễn Thái Ngọc Duy | 2013-07-09 | 1 | -1/+1 |
* | | Merge branch 'mv/merge-ff-tristate' | Junio C Hamano | 2013-07-15 | 1 | -22/+33 |
|\ \ |
|
| * | | merge: handle --ff/--no-ff/--ff-only as a tri-state option | Miklos Vajna | 2013-07-02 | 1 | -22/+33 |
| |/ |
|
* | | Merge branch 'ms/remote-tracking-branches-in-doc' | Junio C Hamano | 2013-07-12 | 1 | -2/+2 |
|\ \
| |/
|/| |
|
| * | Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-doc | Michael Schubert | 2013-07-03 | 1 | -2/+2 |
* | | merge: use help_unknown_ref() | Vikrant Varma | 2013-05-08 | 1 | -1/+2 |
|/ |
|
* | Merge branch 'sg/gpg-sig' | Junio C Hamano | 2013-04-05 | 1 | -1/+36 |
|\ |
|
| * | merge/pull Check for untrusted good GPG signatures | Sebastian Götte | 2013-03-31 | 1 | -0/+3 |
| * | merge/pull: verify GPG signatures of commits being merged | Sebastian Götte | 2013-03-31 | 1 | -1/+33 |
* | | Merge branch 'jc/merge-tag-object' | Junio C Hamano | 2013-04-05 | 1 | -0/+13 |
|\ \
| |/
|/| |
|
| * | merge: a random object may not necssarily be a commit | Junio C Hamano | 2013-03-19 | 1 | -0/+13 |
* | | Merge branch 'jc/custom-comment-char' | Junio C Hamano | 2013-02-04 | 1 | -3/+2 |
|\ \ |
|
| * | | Allow custom "comment char" | Junio C Hamano | 2013-01-16 | 1 | -3/+2 |
* | | | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' | Junio C Hamano | 2013-01-10 | 1 | -0/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | merge --no-edit: do not credit people involved in the side branch | Junio C Hamano | 2012-12-28 | 1 | -0/+1 |
| * | | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -2/+1 |
| |\ \ |
|
* | \ \ | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' | Junio C Hamano | 2013-01-09 | 1 | -2/+3 |
|\ \ \ \ |
|
| * | | | | merge: Honor prepare-commit-msg return code | Antoine Pelisse | 2013-01-03 | 1 | -2/+3 |
| | |_|/
| |/| | |
|
* | | | | Move try_merge_command and checkout_fast_forward to libgit.a | Nguyễn Thái Ngọc Duy | 2012-10-29 | 1 | -104/+2 |
|/ / / |
|
* | | | Merge branch 'nd/i18n-parseopt-help' | Junio C Hamano | 2012-09-07 | 1 | -24/+24 |
|\ \ \ |
|
| * | | | i18n: merge: mark parseopt strings for translation | Nguyễn Thái Ngọc Duy | 2012-08-20 | 1 | -24/+24 |
| |/ / |
|
* | | | Merge branch 'tr/void-diff-setup-done' | Junio C Hamano | 2012-08-22 | 1 | -2/+1 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | diff_setup_done(): return void | Thomas Rast | 2012-08-03 | 1 | -2/+1 |
* | | ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT | Jeff King | 2012-05-24 | 1 | -2/+2 |
* | | Merge branch 'jc/merge-reduce-parents-early' | Junio C Hamano | 2012-04-27 | 1 | -54/+88 |
|\ \ |
|
| * | | builtin/merge.c: reduce parents early | Junio C Hamano | 2012-04-17 | 1 | -25/+40 |
| * | | builtin/merge.c: collect other parents early | Junio C Hamano | 2012-04-17 | 1 | -13/+27 |
| * | | builtin/merge.c: remove "remoteheads" global variable | Junio C Hamano | 2012-04-17 | 1 | -23/+28 |
| |/ |
|
* | | Sync with 1.7.9.6 | Junio C Hamano | 2012-04-02 | 1 | -4/+1 |
|\ \
| |/ |
|
| * | merge: backport GIT_MERGE_AUTOEDIT supportjc/maint-merge-autoedit | Junio C Hamano | 2012-03-20 | 1 | -1/+28 |
| * | Merge branch 'tr/merge-edit-guidance' into maint | Junio C Hamano | 2012-02-27 | 1 | -0/+10 |
| |\ |
|
* | \ | Merge branch 'zj/diff-stat-dyncol' | Junio C Hamano | 2012-03-06 | 1 | -0/+2 |
|\ \ \ |
|
| * | | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncol | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+1 |
| * | | | merge --stat: use the full terminal width | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+1 |
* | | | | merge: do not trust fstat(2) too much when checking interactiveness | Junio C Hamano | 2012-02-23 | 1 | -1/+1 |
* | | | | Merge branch 'jn/merge-no-edit-fix' | Junio C Hamano | 2012-02-12 | 1 | -1/+2 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fix | Junio C Hamano | 2012-02-09 | 1 | -3/+7 |
| |/ / |
|
* | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' | Junio C Hamano | 2012-02-10 | 1 | -1/+2 |
|\ \ \
| |/ / |
|
| * | | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-merge | Junio C Hamano | 2012-02-05 | 1 | -1/+2 |
* | | | Merge branch 'tr/merge-edit-guidance' | Junio C Hamano | 2012-01-31 | 1 | -0/+10 |
|\ \ \
| | |/
| |/| |
|
| * | | merge: add instructions to the commit message when editingtr/merge-edit-guidance | Thomas Rast | 2012-01-31 | 1 | -0/+10 |
| |/ |
|
* | | Merge branch 'jc/pull-signed-tag' | Junio C Hamano | 2012-01-31 | 1 | -4/+34 |
|\ \
| |/
|/| |
|
| * | merge: use editor by default in interactive sessions | Junio C Hamano | 2012-01-23 | 1 | -4/+34 |
* | | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 | 1 | -2/+12 |
|\ \ |
|
| * | | commit: teach --gpg-sign option | Junio C Hamano | 2011-11-12 | 1 | -2/+14 |
| |/ |
|
* | | Merge branch 'jk/maint-strbuf-missing-init' | Junio C Hamano | 2011-12-22 | 1 | -1/+1 |
|\ \ |
|