summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2014-03-18merge: fix GIT_EDITOR override for commit hookLibravatar Benoit Pierre1-1/+1
2014-03-18commit: fix patch hunk editing with "commit -p -m"Libravatar Benoit Pierre1-3/+3
2014-02-27Merge branch 'nv/commit-gpgsign-config'Libravatar Junio C Hamano1-0/+3
2014-02-24commit-tree: add the commit.gpgsign option to sign all commitsLibravatar Nicolas Vigier1-0/+3
2014-01-27Merge branch 'ef/mingw-write'Libravatar Junio C Hamano1-1/+1
2014-01-17prefer xwrite instead of writeLibravatar Erik Faye-Lund1-1/+1
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Libravatar Christian Couder1-6/+6
2013-10-31merge: simplify ff-only optionLibravatar Felipe Contreras1-9/+2
2013-09-17Merge branch 'rh/ishes-doc'Libravatar Junio C Hamano1-1/+1
2013-09-04use 'commit-ish' instead of 'committish'Libravatar Richard Hansen1-1/+1
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLLibravatar Stefan Beller1-6/+6
2013-07-22Merge branch 'nd/const-struct-cache-entry'Libravatar Junio C Hamano1-1/+1
2013-07-15Merge branch 'mv/merge-ff-tristate'Libravatar Junio C Hamano1-22/+33
2013-07-12Merge branch 'ms/remote-tracking-branches-in-doc'Libravatar Junio C Hamano1-2/+2
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2013-07-03Change "remote tracking" to "remote-tracking"Libravatar Michael Schubert1-2/+2
2013-07-02merge: handle --ff/--no-ff/--ff-only as a tri-state optionLibravatar Miklos Vajna1-22/+33
2013-05-08merge: use help_unknown_ref()Libravatar Vikrant Varma1-1/+2
2013-04-05Merge branch 'sg/gpg-sig'Libravatar Junio C Hamano1-1/+36
2013-04-05Merge branch 'jc/merge-tag-object'Libravatar Junio C Hamano1-0/+13
2013-03-31merge/pull Check for untrusted good GPG signaturesLibravatar Sebastian Götte1-0/+3
2013-03-31merge/pull: verify GPG signatures of commits being mergedLibravatar Sebastian Götte1-1/+33
2013-03-19merge: a random object may not necssarily be a commitLibravatar Junio C Hamano1-0/+13
2013-02-04Merge branch 'jc/custom-comment-char'Libravatar Junio C Hamano1-3/+2
2013-01-16Allow custom "comment char"Libravatar Junio C Hamano1-3/+2
2013-01-10Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Libravatar Junio C Hamano1-0/+1
2013-01-09Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'Libravatar Junio C Hamano1-2/+3
2013-01-03merge: Honor prepare-commit-msg return codeLibravatar Antoine Pelisse1-2/+3
2012-12-28merge --no-edit: do not credit people involved in the side branchLibravatar Junio C Hamano1-0/+1
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aLibravatar Nguyễn Thái Ngọc Duy1-104/+2
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Libravatar Junio C Hamano1-2/+1
2012-09-07Merge branch 'nd/i18n-parseopt-help'Libravatar Junio C Hamano1-24/+24
2012-08-22Merge branch 'tr/void-diff-setup-done'Libravatar Junio C Hamano1-2/+1
2012-08-20i18n: merge: mark parseopt strings for translationLibravatar Nguyễn Thái Ngọc Duy1-24/+24
2012-08-03diff_setup_done(): return voidLibravatar Thomas Rast1-2/+1
2012-05-24ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICTLibravatar Jeff King1-2/+2
2012-04-27Merge branch 'jc/merge-reduce-parents-early'Libravatar Junio C Hamano1-54/+88
2012-04-17builtin/merge.c: reduce parents earlyLibravatar Junio C Hamano1-25/+40
2012-04-17builtin/merge.c: collect other parents earlyLibravatar Junio C Hamano1-13/+27
2012-04-17builtin/merge.c: remove "remoteheads" global variableLibravatar Junio C Hamano1-23/+28
2012-04-02Sync with 1.7.9.6Libravatar Junio C Hamano1-4/+1
2012-03-20merge: backport GIT_MERGE_AUTOEDIT supportLibravatar Junio C Hamano1-1/+28
2012-03-06Merge branch 'zj/diff-stat-dyncol'Libravatar Junio C Hamano1-0/+2
2012-03-01diff --stat: add config option to limit graph widthLibravatar Zbigniew Jędrzejewski-Szmek1-0/+1
2012-03-01merge --stat: use the full terminal widthLibravatar Zbigniew Jędrzejewski-Szmek1-0/+1
2012-02-27Merge branch 'tr/merge-edit-guidance' into maintLibravatar Junio C Hamano1-0/+10
2012-02-23merge: do not trust fstat(2) too much when checking interactivenessLibravatar Junio C Hamano1-1/+1
2012-02-12Merge branch 'jn/merge-no-edit-fix'Libravatar Junio C Hamano1-1/+2
2012-02-10Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Libravatar Junio C Hamano1-1/+2
2012-02-09merge: do not launch an editor on "--no-edit $tag"Libravatar Junio C Hamano1-3/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 00:44:40 +0000