aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAge
* 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
| * | builtin/merge.c: remove "remoteheads" global variableJunio C Hamano2012-04-17
| |/
* | Sync with 1.7.9.6Junio C Hamano2012-04-02
|\ \ | |/
| * merge: backport GIT_MERGE_AUTOEDIT supportJunio C Hamano2012-03-20
| * Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano2012-02-27
| |\
* | \ Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-06
|\ \ \
| * | | diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek2012-03-01
| * | | merge --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-01
* | | | merge: do not trust fstat(2) too much when checking interactivenessJunio C Hamano2012-02-23
* | | | Merge branch 'jn/merge-no-edit-fix'Junio C Hamano2012-02-12
|\ \ \ \ | | |/ / | |/| |
| * | | merge: do not launch an editor on "--no-edit $tag"Junio C Hamano2012-02-09
| |/ /
* | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Junio C Hamano2012-02-10
|\ \ \ | |/ /
| * | merge: do not create a signed tag merge under --ff-only optionJunio C Hamano2012-02-05
* | | Merge branch 'tr/merge-edit-guidance'Junio C Hamano2012-01-31
|\ \ \ | | |/ | |/|
| * | merge: add instructions to the commit message when editingThomas Rast2012-01-31
| |/
* | Merge branch 'jc/pull-signed-tag'Junio C Hamano2012-01-31
|\ \ | |/ |/|
| * merge: use editor by default in interactive sessionsJunio C Hamano2012-01-23
* | Merge branch 'jc/show-sig'Junio C Hamano2012-01-06
|\ \
| * | commit: teach --gpg-sign optionJunio C Hamano2011-11-12
| |/
* | Merge branch 'jk/maint-strbuf-missing-init'Junio C Hamano2011-12-22
|\ \
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-15 07:52:11 +0000