Re: [PATCH 2/3] commit/status: "git add <path>" is not necessarily how to resolve
flat view
From: Nanako Shiraishi <hidden>
Date: 2016-06-15 22:47:54
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 2/3] commit/status: "git add <path>" is not necessarily how to resolve · Junio C Hamano <hidden>
Quoting Junio C Hamano [off-list ref]
quoted hunk ↗ jump to hunk
# On branch side # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) -# (use "git add <file>..." to mark resolution) +# (use "git add/rm <file>..." as appropriately to mark resolution)
Shouldn't this either be "as appropriate" or just "appropriately"? -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/