diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:51:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:51:45 -0700 |
| commit | 4e520081b5ca75acd6b29f6385a94130ec7afe6d (patch) | |
| tree | 23e89c6ef11f6227f40cc3edc19dc9c6d7267259 /Documentation/user-manual.conf | |
| parent | Merge branch 'tr/maint-word-diff-regex-sticky' (diff) | |
| parent | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd (diff) | |
| download | tgif-4e520081b5ca75acd6b29f6385a94130ec7afe6d.tar.xz | |
Merge branch 'jh/notes-merge-in-git-dir-worktree'
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.
By Johan Herland (3) and Junio C Hamano (1)
* 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
Diffstat (limited to 'Documentation/user-manual.conf')
0 files changed, 0 insertions, 0 deletions