summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* merge: simplify ff-only optionFelipe Contreras2013-10-311-9/+2
* Merge branch 'rh/ishes-doc'Junio C Hamano2013-09-171-1/+1
|\
| * use 'commit-ish' instead of 'committish'Richard Hansen2013-09-041-1/+1
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-6/+6
|/
* Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-221-1/+1
|\
| * Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-1/+1
* | Merge branch 'mv/merge-ff-tristate'Junio C Hamano2013-07-151-22/+33
|\ \
| * | merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna2013-07-021-22/+33
| |/
* | Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano2013-07-121-2/+2
|\ \ | |/ |/|
| * Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-docMichael Schubert2013-07-031-2/+2
* | merge: use help_unknown_ref()Vikrant Varma2013-05-081-1/+2
|/
* Merge branch 'sg/gpg-sig'Junio C Hamano2013-04-051-1/+36
|\
| * merge/pull Check for untrusted good GPG signaturesSebastian Götte2013-03-311-0/+3
| * merge/pull: verify GPG signatures of commits being mergedSebastian Götte2013-03-311-1/+33
* | Merge branch 'jc/merge-tag-object'Junio C Hamano2013-04-051-0/+13
|\ \ | |/ |/|
| * merge: a random object may not necssarily be a commitJunio C Hamano2013-03-191-0/+13
* | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-041-3/+2
|\ \
| * | Allow custom "comment char"Junio C Hamano2013-01-161-3/+2
* | | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Junio C Hamano2013-01-101-0/+1
|\ \ \ | |/ / |/| |
| * | merge --no-edit: do not credit people involved in the side branchJunio C Hamano2012-12-281-0/+1
| * | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-111-2/+1
| |\ \
* | \ \ Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'Junio C Hamano2013-01-091-2/+3
|\ \ \ \
| * | | | merge: Honor prepare-commit-msg return codeAntoine Pelisse2013-01-031-2/+3
| | |_|/ | |/| |
* | | | Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-291-104/+2
|/ / /
* | | Merge branch 'nd/i18n-parseopt-help'Junio C Hamano2012-09-071-24/+24
|\ \ \
| * | | i18n: merge: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-24/+24
| |/ /
* | | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-221-2/+1
|\ \ \ | |/ / |/| / | |/
| * diff_setup_done(): return voidThomas Rast2012-08-031-2/+1
* | ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICTJeff King2012-05-241-2/+2
* | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-271-54/+88
|\ \
| * | builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-171-25/+40
| * | builtin/merge.c: collect other parents earlyJunio C Hamano2012-04-171-13/+27
| * | builtin/merge.c: remove "remoteheads" global variableJunio C Hamano2012-04-171-23/+28
| |/
* | Sync with 1.7.9.6Junio C Hamano2012-04-021-4/+1
|\ \ | |/
| * merge: backport GIT_MERGE_AUTOEDIT supportjc/maint-merge-autoeditJunio C Hamano2012-03-201-1/+28
| * Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano2012-02-271-0/+10
| |\
* | \ Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-061-0/+2
|\ \ \
| * | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncolZbigniew Jędrzejewski-Szmek2012-03-011-0/+1
| * | | merge --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-011-0/+1
* | | | merge: do not trust fstat(2) too much when checking interactivenessJunio C Hamano2012-02-231-1/+1
* | | | Merge branch 'jn/merge-no-edit-fix'Junio C Hamano2012-02-121-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fixJunio C Hamano2012-02-091-3/+7
| |/ /
* | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Junio C Hamano2012-02-101-1/+2
|\ \ \ | |/ /
| * | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-mergeJunio C Hamano2012-02-051-1/+2
* | | Merge branch 'tr/merge-edit-guidance'Junio C Hamano2012-01-311-0/+10
|\ \ \ | | |/ | |/|
| * | merge: add instructions to the commit message when editingtr/merge-edit-guidanceThomas Rast2012-01-311-0/+10
| |/
* | Merge branch 'jc/pull-signed-tag'Junio C Hamano2012-01-311-4/+34
|\ \ | |/ |/|
| * merge: use editor by default in interactive sessionsJunio C Hamano2012-01-231-4/+34
* | Merge branch 'jc/show-sig'Junio C Hamano2012-01-061-2/+12
|\ \
| * | commit: teach --gpg-sign optionJunio C Hamano2011-11-121-2/+14
| |/
View Lorry Controller Status