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
/
Documentation
/
git-merge.txt
Age
Commit message (
Expand
)
Author
2018-10-29
config.txt: move merge-config.txt to config/
Nguyễn Thái Ngọc Duy
2018-08-03
Merge branch 'en/dirty-merge-fixes'
Junio C Hamano
2018-07-12
merge: allow reading the merge commit message from a file
Johannes Schindelin
2018-07-11
merge: fix misleading pre-merge check documentation
Elijah Newren
2018-06-18
Merge branch 'mw/doc-merge-enumfix'
Junio C Hamano
2018-06-14
doc: update the order of the syntax `git merge --continue`
Meng-Sung Wu
2017-11-06
Merge branch 'wk/pull-signoff'
Junio C Hamano
2017-10-19
Merge branch 'wk/merge-options-gpg-sign-doc'
Junio C Hamano
2017-10-13
pull: pass --signoff/--no-signoff to "git merge"
W. Trevor King
2017-10-12
Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
W. Trevor King
2017-09-10
Merge branch 'ma/up-to-date'
Junio C Hamano
2017-08-27
Merge branch 'mg/killed-merge'
Junio C Hamano
2017-08-23
treewide: correct several "up-to-date" to "up to date"
Martin Ågren
2017-08-22
Documentation/git-merge: explain --continue
Michael J Gruber
2017-07-25
merge: add a --signoff flag
Łukasz Gryglicki
2017-03-31
Merge branch 'jc/merge-drop-old-syntax'
Junio C Hamano
2016-12-14
merge: add '--continue' option as a synonym for 'git commit'
Chris Packham
2016-04-21
pull: pass --allow-unrelated-histories to "git merge"
Junio C Hamano
2016-03-23
merge: refuse to create too cool a merge by default
Junio C Hamano
2015-10-05
Merge branch 'mm/keyid-docs'
Junio C Hamano
2015-09-21
Documentation: explain optional arguments better
Matthieu Moy
2015-09-21
Documentation: use 'keyid' consistently, not 'key-id'
Matthieu Moy
2015-09-17
Merge branch 'po/doc-branch-desc'
Junio C Hamano
2015-09-14
doc: show usage of branch description
Philip Oakley
2015-05-19
Merge branch 'jc/merge'
Junio C Hamano
2015-04-29
merge: drop 'git merge <message> HEAD <commit>' syntax
Junio C Hamano
2015-04-29
merge: handle FETCH_HEAD internally
Junio C Hamano
2015-03-14
*config.txt: stick to camelCase naming convention
Nguyễn Thái Ngọc Duy
2014-04-22
merge: enable defaulttoupstream by default
Felipe Contreras
2014-03-24
parse-options: multi-word argh should use dash to separate words
Junio C Hamano
2013-10-18
git-merge: document the -S option
Nicolas Vigier
2013-09-06
Merge branch 'maint-1.8.2' into maint-1.8.3
Junio C Hamano
2013-09-05
Documentation/git-merge.txt: fix formatting of example block
Andreas Schwab
2013-07-22
Merge branch 'mm/merge-in-dirty-worktree-doc' into maint
Junio C Hamano
2013-06-18
Documentation/git-merge.txt: weaken warning about uncommited changes
Matthieu Moy
2013-05-17
documentation: trivial style cleanups
Felipe Contreras
2013-04-01
Merge branch 'yd/doc-merge-annotated-tag' into maint
Junio C Hamano
2013-03-29
Merge branch 'yd/doc-merge-annotated-tag'
Junio C Hamano
2013-03-22
Documentation: merging a tag is a special case
Junio C Hamano
2013-02-02
Documentation: the name of the system is 'Git', not 'git'
Thomas Ackermann
2012-10-25
Documentation: remote tracking branch -> remote-tracking branch
Matthieu Moy
2012-07-15
doc: A few minor copy edits.
Štěpán Němec
2012-01-24
merge: use editor by default in interactive sessions
Junio C Hamano
2011-04-02
Merge branch 'jc/merge-sans-branch'
Junio C Hamano
2011-03-24
merge: merge with the default upstream branch without argument
Junio C Hamano
2011-03-11
doc: drop author/documentation sections from most pages
Jeff King
2010-12-08
Merge branch 'jh/notes-merge'
Junio C Hamano
2010-11-18
Provide 'git merge --abort' as a synonym to 'git reset --merge'
Johan Herland
2010-10-29
Fix a formatting error in git-merge.txt
Nathan W. Panike
2010-05-10
merge: --log appends shortlog to message if specified
Tay Ray Chuan
[next]