| commit | 0c1b1de1d9f007b9c0b0ca7c3b17a1ffaaec532b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Mar 2012 22:54:57 +0000 (20 15:54 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Mar 2012 22:54:57 +0000 (20 15:54 -0700) | ||
| tree | b12b5a34624974e4a968162c7c73b0282aed6d5c | treesnapshot (tar.gz zip) |
| parent | b3f67cd0a53ebb775165bf5ce77cf6c081a305d0 | commitdiff |
| parent | dabba590aa0e94a8deb6f0e827144697895bcfe8 | commitdiff |
Merge branch 'jh/notes-merge-in-git-dir-worktree' into next
Running "notes merge --commit" failed to perform correctly when run
from any directory inside $GIT_DIR/. When "notes merge" stops with
conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
to resolve it.
Not urgent.
* jh/notes-merge-in-git-dir-worktree:
notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
notes-merge: use opendir/readdir instead of using read_directory()
t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
remove_dir_recursively(): Add flag for skipping removal of toplevel dir
Running "notes merge --commit" failed to perform correctly when run
from any directory inside $GIT_DIR/. When "notes merge" stops with
conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
to resolve it.
Not urgent.
* jh/notes-merge-in-git-dir-worktree:
notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
notes-merge: use opendir/readdir instead of using read_directory()
t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
remove_dir_recursively(): Add flag for skipping removal of toplevel dir