aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAge
...
* | | | | Merge branch 'mg/verify-commit'Junio C Hamano2014-07-10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | gpg-interface: provide clear helper for struct signature_checkMichael J Gruber2014-06-23
* | | | | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-02
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | commit_tree: take a pointer/len pair rather than a const strbufJeff King2014-06-12
| |/ /
* | | Merge branch 'fc/merge-default-to-upstream'Junio C Hamano2014-06-03
|\ \ \
| * | | merge: enable defaulttoupstream by defaultFelipe Contreras2014-04-22
| |/ /
* | | Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-03
|\ \ \ | |/ / |/| |
| * | refs.h: rename the action_on_err constantsMichael Haggerty2014-04-07
* | | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-04-08
|\ \ \ | |/ / |/| |
| * | parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-24
* | | Merge branch 'bp/commit-p-editor'Junio C Hamano2014-03-28
|\ \ \ | |/ / |/| |
| * | merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-18
| * | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-18
* | | Merge branch 'nv/commit-gpgsign-config'Junio C Hamano2014-02-27
|\ \ \ | |/ / |/| |
| * | commit-tree: add the commit.gpgsign option to sign all commitsNicolas Vigier2014-02-24
* | | Merge branch 'ef/mingw-write'Junio C Hamano2014-01-27
|\ \ \
| * | | prefer xwrite instead of writeErik Faye-Lund2014-01-17
| | |/ | |/|
* | | replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder2013-12-05
|/ /
* | merge: simplify ff-only optionFelipe Contreras2013-10-31
|/
* Merge branch 'rh/ishes-doc'Junio C Hamano2013-09-17
|\
| * use 'commit-ish' instead of 'committish'Richard Hansen2013-09-04
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-05
|/
* Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-22
|\
| * Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy2013-07-09
* | Merge branch 'mv/merge-ff-tristate'Junio C Hamano2013-07-15
|\ \
| * | merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna2013-07-02
| |/
* | Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano2013-07-12
|\ \ | |/ |/|
| * Change "remote tracking" to "remote-tracking"Michael Schubert2013-07-03
* | merge: use help_unknown_ref()Vikrant Varma2013-05-08
|/
* Merge branch 'sg/gpg-sig'Junio C Hamano2013-04-05
|\
| * merge/pull Check for untrusted good GPG signaturesSebastian Götte2013-03-31
| * merge/pull: verify GPG signatures of commits being mergedSebastian Götte2013-03-31
* | Merge branch 'jc/merge-tag-object'Junio C Hamano2013-04-05
|\ \ | |/ |/|
| * merge: a random object may not necssarily be a commitJunio C Hamano2013-03-19
* | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-04
|\ \
| * | Allow custom "comment char"Junio C Hamano2013-01-16
* | | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Junio C Hamano2013-01-10
|\ \ \ | |/ / |/| |
| * | merge --no-edit: do not credit people involved in the side branchJunio C Hamano2012-12-28
| * | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \
* | \ \ Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'Junio C Hamano2013-01-09
|\ \ \ \
| * | | | merge: Honor prepare-commit-msg return codeAntoine Pelisse2013-01-03
| | |_|/ | |/| |
* | | | Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-29
|/ / /
* | | Merge branch 'nd/i18n-parseopt-help'Junio C Hamano2012-09-07
|\ \ \
| * | | i18n: merge: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-20
| |/ /
* | | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-22
|\ \ \ | |/ / |/| / | |/
| * diff_setup_done(): return voidThomas Rast2012-08-03
* | ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICTJeff King2012-05-24
* | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-27
|\ \
| * | builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-17
| * | builtin/merge.c: collect other parents earlyJunio C Hamano2012-04-17
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-09 08:12:28 +0000