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
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
2008-09-05
Fix AsciiDoc errors in merge documentation
Johan Herland
2008-09-01
git-merge documentation: describe how conflict is presented
Junio C Hamano
2008-08-23
git-merge documentation: more details about resolving conflicts
Dan Hensgen
2008-07-31
Make the DESCRIPTION match <x>... items in the SYNOPSIS
Abhijit Menon-Sen
2008-07-21
Update my e-mail address
Junio C Hamano
2008-07-19
Documentation/git-merge.txt: Partial rewrite of How Merge Works
Petr Baudis
2008-07-09
Documentation: mention ORIG_HEAD in am, merge, and rebase
Brian Gernhardt
2008-07-05
manpages: italicize git command names (which were in teletype font)
Jonathan Nieder
2008-07-02
Documentation formatting and cleanup
Jonathan Nieder
2008-07-02
Documentation: be consistent about "git-" versus "git "
Jonathan Nieder
2008-06-06
documentation: move git(7) to git(1)
Christian Couder
2008-04-13
merge, pull: introduce '--(no-)stat' option
SZEDER Gábor
2008-04-13
doc: moved merge.* config variables into separate merge-config.txt
SZEDER Gábor
2008-03-04
Fix incorrect wording in git-merge.txt.
Matthieu Moy
2008-01-16
Documentation: fix and clarify grammar in git-merge docs.
Dave Peticolas
2008-01-07
Documentation: rename gitlink macro to linkgit
Dan McGee
2007-12-23
Documentation: describe 'union' low-level merge driver
Junio C Hamano
2007-10-31
Merge branch 'maint' into HEAD
Junio C Hamano
2007-10-31
git-merge: document but discourage the historical syntax
Junio C Hamano
2007-10-03
Merge branch 'lh/merge'
Junio C Hamano
2007-09-26
Fix spelling of overridden in documentation
Shawn Bohrer
2007-09-24
git-merge: add support for branch.<name>.mergeoptions
Lars Hjemli
2007-08-02
Try to be consistent with capitalization in the documentation
Steve Hoelzer
2007-07-13
Update git-merge documentation.
Jakub Narebski
2007-06-07
War on whitespace
Junio C Hamano
2007-05-25
Add a configuration option to control diffstat after merge
Alex Riesen
2007-02-17
Convert update-index references in docs to add.
Shawn O. Pearce
2007-02-13
git merge documentation: -m is optional
Matthias Lederhofer
2007-01-19
Documentation: sync git.txt command list and manual page title
Junio C Hamano
2006-12-28
Use GIT_REFLOG_ACTION environment variable instead.
Shawn O. Pearce
2006-11-22
git-merge: make it usable as the first class UI
Junio C Hamano
2006-07-09
Assorted typo fixes
Pavel Roskin
2005-12-17
Examples of resetting.
Junio C Hamano
2005-12-02
git-merge documentation: conflicting merge leaves higher stages in index
Junio C Hamano
2005-11-29
Documentation: Describe merge operation a bit better.
Junio C Hamano
2005-11-07
Refactored merge options into separate merge-options.txt.
Jon Loeliger
2005-11-06
Refactor merge strategies into separate includable file.
Jon Loeliger
2005-11-05
Documentation: git-fetch/pull updates.
Junio C Hamano
2005-11-04
Documentation: -merge and -pull: describe merge strategies.
Junio C Hamano
2005-11-02
Documentation for git-fmt-merge-msg
Petr Baudis
2005-10-11
Remove the version tags from the manpages
Junio C Hamano
2005-09-21
[PATCH] Documentation: Update all files to use the new gitlink: macro
Sergey Vlasov
2005-09-11
'git-merge': Documentation.
Junio C Hamano