Difference between revisions of "Git/merge"
< Git
Jump to navigation
Jump to search
(Created page with "'''Action''': join two or more development histories together "Incorporates changes from the named {{l/same|commit}}s (since the time their histories diverged from the curre...") |
(No difference)
|
Revision as of 13:59, 9 March 2015
Action: join two or more development histories together
"Incorporates changes from the named commits (since the time their histories diverged from the current branch) into the current branch. This command is used by git pull to incorporate changes from another repository and can be used by hand to merge changes from one branch into another."