projects
/
gnulib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a55d42d
)
tweak git-merge-changelog README
author
Ian Beckwith
<ianb@erislabs.net>
Sun, 2 Mar 2014 11:15:57 +0000
(11:15 +0000)
committer
Ian Beckwith
<ianb@erislabs.net>
Sun, 2 Mar 2014 11:15:57 +0000
(11:15 +0000)
debian/README.git-merge-changelog
patch
|
blob
|
history
diff --git
a/debian/README.git-merge-changelog
b/debian/README.git-merge-changelog
index
61ce6eb
..
e68b69f
100644
(file)
--- a/
debian/README.git-merge-changelog
+++ b/
debian/README.git-merge-changelog
@@
-26,19
+26,13
@@
/* Installation:
/* Installation:
- $ gnulib-tool --create-testdir --dir=/tmp/testdir123 git-merge-changelog
- $ cd /tmp/testdir123
- $ ./configure
- $ make
- $ make install
-
- Additionally, for git users:
+ For git users:
- Add to .git/config of the checkout (or to your $HOME/.gitconfig) the
lines
[merge "merge-changelog"]
name = GNU-style ChangeLog merge driver
- Add to .git/config of the checkout (or to your $HOME/.gitconfig) the
lines
[merge "merge-changelog"]
name = GNU-style ChangeLog merge driver
- driver = /usr/
local/
bin/git-merge-changelog %O %A %B
+ driver = /usr/bin/git-merge-changelog %O %A %B
- In every directory that contains a ChangeLog file, add a file
'.gitattributes' with this line:
- In every directory that contains a ChangeLog file, add a file
'.gitattributes' with this line:
@@
-47,7
+41,7
@@
(See "man 5 gitattributes" for more info.)
(See "man 5 gitattributes" for more info.)
-
Additionally, f
or bzr users:
+
F
or bzr users:
- Install the 'extmerge' bzr plug-in listed at
<http://doc.bazaar.canonical.com/plugins/en/index.html>
<http://wiki.bazaar.canonical.com/BzrPlugins>
- Install the 'extmerge' bzr plug-in listed at
<http://doc.bazaar.canonical.com/plugins/en/index.html>
<http://wiki.bazaar.canonical.com/BzrPlugins>
@@
-59,14
+53,14
@@
$ bzr extmerge ChangeLog
$ bzr extmerge ChangeLog
-
Additionally, f
or hg users:
+
F
or hg users:
- Add to your $HOME/.hgrc the lines
[merge-patterns]
ChangeLog = git-merge-changelog
[merge-tools]
- Add to your $HOME/.hgrc the lines
[merge-patterns]
ChangeLog = git-merge-changelog
[merge-tools]
- git-merge-changelog.executable = /usr/
local/
bin/git-merge-changelog
+ git-merge-changelog.executable = /usr/bin/git-merge-changelog
git-merge-changelog.args = $base $local $other
See <http://www.selenic.com/mercurial/hgrc.5.html> section merge-tools
git-merge-changelog.args = $base $local $other
See <http://www.selenic.com/mercurial/hgrc.5.html> section merge-tools