summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
2014-06-03Merge branch 'mh/ref-transaction'Junio C Hamano
2014-04-22merge: enable defaulttoupstream by defaultFelipe Contreras
2014-04-08Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano
2014-04-07refs.h: rename the action_on_err constantsMichael Haggerty
2014-03-28Merge branch 'bp/commit-p-editor'Junio C Hamano
2014-03-24parse-options: multi-word argh should use dash to separate wordsJunio C Hamano
2014-03-18merge: fix GIT_EDITOR override for commit hookBenoit Pierre
2014-03-18commit: fix patch hunk editing with "commit -p -m"Benoit Pierre
2014-02-27Merge branch 'nv/commit-gpgsign-config'Junio C Hamano
2014-02-24commit-tree: add the commit.gpgsign option to sign all commitsNicolas Vigier
2014-01-27Merge branch 'ef/mingw-write'Junio C Hamano
2014-01-17prefer xwrite instead of writeErik Faye-Lund
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder
2013-10-31merge: simplify ff-only optionFelipe Contreras
2013-09-17Merge branch 'rh/ishes-doc'Junio C Hamano
2013-09-04use 'commit-ish' instead of 'committish'Richard Hansen
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller
2013-07-22Merge branch 'nd/const-struct-cache-entry'Junio C Hamano
2013-07-15Merge branch 'mv/merge-ff-tristate'Junio C Hamano
2013-07-12Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy
2013-07-03Change "remote tracking" to "remote-tracking"Michael Schubert
2013-07-02merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna
2013-05-08merge: use help_unknown_ref()Vikrant Varma
2013-04-05Merge branch 'sg/gpg-sig'Junio C Hamano
2013-04-05Merge branch 'jc/merge-tag-object'Junio C Hamano
2013-04-01merge/pull Check for untrusted good GPG signaturesSebastian Götte
2013-04-01merge/pull: verify GPG signatures of commits being mergedSebastian Götte
2013-03-19merge: a random object may not necssarily be a commitJunio C Hamano
2013-02-04Merge branch 'jc/custom-comment-char'Junio C Hamano
2013-01-16Allow custom "comment char"Junio C Hamano
2013-01-10Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Junio C Hamano
2013-01-09Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'Junio C Hamano
2013-01-03merge: Honor prepare-commit-msg return codeAntoine Pelisse
2012-12-28merge --no-edit: do not credit people involved in the side branchJunio C Hamano
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano
2012-09-07Merge branch 'nd/i18n-parseopt-help'Junio C Hamano
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano
2012-08-20i18n: merge: mark parseopt strings for translationNguyễn Thái Ngọc Duy
2012-08-03diff_setup_done(): return voidThomas Rast
2012-05-25ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICTJeff King
2012-04-27Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano
2012-04-18builtin/merge.c: reduce parents earlyJunio C Hamano
2012-04-18builtin/merge.c: collect other parents earlyJunio C Hamano
2012-04-18builtin/merge.c: remove "remoteheads" global variableJunio C Hamano
2012-04-02Sync with 1.7.9.6Junio C Hamano
2012-03-20merge: backport GIT_MERGE_AUTOEDIT supportJunio C Hamano
2012-03-06Merge branch 'zj/diff-stat-dyncol'Junio C Hamano
2012-03-01diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek