]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 91ebbbf) | patch
Stop assuming .git is a directory in gitmerge.el
authorNoam Postavsky <npostavs@gmail.com>
Tue, 12 Jun 2018 00:41:07 +0000 (20:41 -0400)
committerNoam Postavsky <npostavs@gmail.com>
Tue, 19 Jun 2018 00:02:04 +0000 (20:02 -0400)
commit5498acb5a2b4a19060d17c0e2ce0aec36ee684f9
tree85eb75e45e6b6a830366c498d7a23c6bd2cac6cdtree | snapshot
parent91ebbbfa107c60db84e09d54d952ffd969821ccbcommit | diff
Stop assuming .git is a directory in gitmerge.el

* admin/gitmerge.el (gitmerge-maybe-resume): Use 'git rev-parse
--git-dir' to find the git directory rather than assuming it is
.git/ (that assumption fails for separated worktrees).
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.