diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-23 22:31:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-23 22:31:51 -0800 |
| commit | 444e10df2a4159b5dd2975feadbb9e1213d65b47 (patch) | |
| tree | e0d4c7715d74c457f063c1b12105cf77cec60dae /commit.c | |
| parent | Merge branch 'jc/log-stdin' (diff) | |
| parent | user-manual: Document that "git merge" doesn't like uncommited changes. (diff) | |
| download | git-444e10df2a4159b5dd2975feadbb9e1213d65b47.tar.gz git-444e10df2a4159b5dd2975feadbb9e1213d65b47.zip | |
Merge branch 'mm/maint-hint-failed-merge'
* mm/maint-hint-failed-merge:
user-manual: Document that "git merge" doesn't like uncommited changes.
merge-recursive: point the user to commit when file would be overwritten.
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions