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
2015-05-19
Merge branch 'jc/merge'
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
2010-04-12
Docs: Add -X option to git-merge's synopsis.
Marc Branchaud
2010-01-24
Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast
Junio C Hamano
2010-01-24
Documentation: merge: use MERGE_HEAD to refer to the remote branch
Jonathan Nieder
2010-01-24
Documentation: simplify How Merge Works
Jonathan Nieder
2010-01-24
Documentation: merge: add a section about fast-forward
Jonathan Nieder
2010-01-24
Documentation: emphasize when git merge terminates early
Jonathan Nieder
2010-01-24
Documentation: merge: add an overview
Jonathan Nieder
2010-01-24
Documentation: merge: move merge strategy list to end
Jonathan Nieder
2010-01-24
Documentation: suggest `reset --merge` in How Merge Works section
Jonathan Nieder
2010-01-24
Documentation: merge: move configuration section to end
Jonathan Nieder
2010-01-21
Merge remote branch 'remotes/trast-doc/for-next'
Junio C Hamano
2010-01-10
Documentation: spell 'git cmd' without dash throughout
Thomas Rast
2010-01-10
Documentation: format full commands in typewriter font
Thomas Rast
2010-01-09
Documentation: warn prominently against merging with dirty trees
Thomas Rast
2010-01-09
Documentation/git-merge: reword references to "remote" and "pull"
Thomas Rast
2009-12-04
Teach --[no-]rerere-autoupdate option to merge, revert and friends
Junio C Hamano
2009-10-22
modernize fetch/merge/pull examples
Clemens Buchacher
2009-10-10
Documentation: clarify mergeoptions description
Jonathan Nieder
2009-10-10
Documentation: git fmt-merge-msg does not have to be a script
Jonathan Nieder
2009-08-13
Documentation: merge: one <remote> is required
Paul Bolle
2009-03-26
Grammar fix for "git merge" man page
Wincent Colaiuta
2009-03-26
Grammar fixes to "merge" and "patch-id" docs
Wincent Colaiuta
2009-03-18
Documentation: remove extra quoting/emphasis around literal texts
Chris Johnsen
2008-12-10
Improve language in git-merge.txt and related docs
Ralf Wildenhues
2008-09-29
Merge branch 'jc/better-conflict-resolution'
Shawn O. Pearce
[next]