GNU-style ChangeLog merge driver for Windows
C Shell Other
Switch branches/tags
Nothing to show
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Failed to load latest commit information.
build-aux
config
doc
lib
m4
modules
tests
top
.cvsignore
.gitattributes
.gitignore
COPYING
ChangeLog
DEPENDENCIES
MODULES.html.sh
Makefile
NEWS
README
README.md
STATUS-libposix
build-git-merge-changelog-exe.sh
cfg.mk
check-copyright
check-module
gnulib-tool
posix-modules
users.txt

README.md

git-merge-changelog for Windows

DOWNLOAD

https://github.com/downloads/miyamuko/git-merge-changelog-for-windows/git-merge-changelog.exe

USAGE

  1. Add following entry to your ~/.gitconfig.

    [merge "merge-changelog"] name = GNU-style ChangeLog merge driver driver = /path/to/git-merge-changelog.exe %O %A %B

  2. Set merge strategies for each changelog files.

    ChangeLog      merge=merge-changelog
    ChangeLog.txt  merge=merge-changelog
    

BUILD

  1. Install MinGW/msys

  2. Try:

    git clone https://github.com/miyamuko/git-merge-changelog-for-windows.git
    cd git-merge-changelog-for-windows
    sh build-git-merge-changelog-exe.sh