diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-26 10:32:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-26 10:32:55 -0700 |
| commit | 058432635bba2e0b282725865437fbd57ddfa02e (patch) | |
| tree | e4642c2e2ed39e4da46faddfd8c37164503726f9 /Documentation/technical/api-parse-options.txt | |
| parent | Sync with 1.7.9.7 (diff) | |
| parent | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd (diff) | |
| download | tgif-058432635bba2e0b282725865437fbd57ddfa02e.tar.xz | |
Merge branch 'jh/notes-merge-in-git-dir-worktree' into maint
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/technical/api-parse-options.txt')
0 files changed, 0 insertions, 0 deletions