Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin
/
merge.c
Age
Commit message (
Expand
)
Author
2014-01-27
Merge branch 'ef/mingw-write'
Junio C Hamano
2014-01-18
prefer xwrite instead of write
Erik Faye-Lund
2013-12-06
replace {pre,suf}fixcmp() with {starts,ends}_with()
Christian Couder
2013-10-31
merge: simplify ff-only option
Felipe Contreras
2013-09-17
Merge branch 'rh/ishes-doc'
Junio C Hamano
2013-09-05
use 'commit-ish' instead of 'committish'
Richard Hansen
2013-08-05
Replace deprecated OPT_BOOLEAN by OPT_BOOL
Stefan Beller
2013-07-22
Merge branch 'nd/const-struct-cache-entry'
Junio C Hamano
2013-07-15
Merge branch 'mv/merge-ff-tristate'
Junio C Hamano
2013-07-12
Merge branch 'ms/remote-tracking-branches-in-doc'
Junio C Hamano
2013-07-09
Convert "struct cache_entry *" to "const ..." wherever possible
Nguyễn Thái Ngọc Duy
2013-07-04
Change "remote tracking" to "remote-tracking"
Michael Schubert
2013-07-03
merge: handle --ff/--no-ff/--ff-only as a tri-state option
Miklos Vajna
2013-05-09
merge: use help_unknown_ref()
Vikrant Varma
2013-04-06
Merge branch 'sg/gpg-sig'
Junio C Hamano
2013-04-06
Merge branch 'jc/merge-tag-object'
Junio C Hamano
2013-04-01
merge/pull Check for untrusted good GPG signatures
Sebastian Götte
2013-04-01
merge/pull: verify GPG signatures of commits being merged
Sebastian Götte
2013-03-19
merge: a random object may not necssarily be a commit
Junio C Hamano
2013-02-04
Merge branch 'jc/custom-comment-char'
Junio C Hamano
2013-01-17
Allow custom "comment char"
Junio C Hamano
2013-01-11
Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'
Junio C Hamano
2013-01-09
Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'
Junio C Hamano
2013-01-03
merge: Honor prepare-commit-msg return code
Antoine Pelisse
2012-12-29
merge --no-edit: do not credit people involved in the side branch
Junio C Hamano
2012-10-29
Move try_merge_command and checkout_fast_forward to libgit.a
Nguyễn Thái Ngọc Duy
2012-09-11
Merge branch 'tr/void-diff-setup-done' into maint-1.7.11
Junio C Hamano
2012-09-07
Merge branch 'nd/i18n-parseopt-help'
Junio C Hamano
2012-08-22
Merge branch 'tr/void-diff-setup-done'
Junio C Hamano
2012-08-20
i18n: merge: mark parseopt strings for translation
Nguyễn Thái Ngọc Duy
2012-08-03
diff_setup_done(): return void
Thomas Rast
2012-05-25
ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT
Jeff King
2012-04-28
Merge branch 'jc/merge-reduce-parents-early'
Junio C Hamano
2012-04-18
builtin/merge.c: reduce parents early
Junio C Hamano
2012-04-18
builtin/merge.c: collect other parents early
Junio C Hamano
2012-04-18
builtin/merge.c: remove "remoteheads" global variable
Junio C Hamano
2012-04-03
Sync with 1.7.9.6
Junio C Hamano
2012-03-21
merge: backport GIT_MERGE_AUTOEDIT support
Junio C Hamano
2012-03-07
Merge branch 'zj/diff-stat-dyncol'
Junio C Hamano
2012-03-01
diff --stat: add config option to limit graph width
Zbigniew Jędrzejewski-Szmek
2012-03-01
merge --stat: use the full terminal width
Zbigniew Jędrzejewski-Szmek
2012-02-28
Merge branch 'tr/merge-edit-guidance' into maint
Junio C Hamano
2012-02-24
merge: do not trust fstat(2) too much when checking interactiveness
Junio C Hamano
2012-02-13
Merge branch 'jn/merge-no-edit-fix'
Junio C Hamano
2012-02-11
Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'
Junio C Hamano
2012-02-10
merge: do not launch an editor on "--no-edit $tag"
Junio C Hamano
2012-02-06
merge: do not create a signed tag merge under --ff-only option
Junio C Hamano
2012-02-01
Merge branch 'tr/merge-edit-guidance'
Junio C Hamano
2012-02-01
Merge branch 'jc/pull-signed-tag'
Junio C Hamano
2012-02-01
merge: add instructions to the commit message when editing
Thomas Rast
[next]