git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-24 05:26:51 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
ba3c69a9ee1894de397b60d3b548383e13ef49e3
git/Documentation/git-merge.txt
Junio C Hamano ffc5e3c958 Merge branch 'jc/merge-sans-branch' 
* jc/merge-sans-branch:
  merge: merge with the default upstream branch without argument
  merge: match the help text with the documentation

Conflicts:
	builtin/merge.c
2011-04-01 17:57:16 -07:00

11 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink