git-hacks

git-hacks Commit Details

Date:2014-05-09 23:21:24 (3 years 8 months ago)
Author:Nicola Fontana
Branch:master
Commit:abc2af51e5fa377463aa52e8c337b5f603650253
Parents: b2818854d19027ccb0d4cfc446303405c48eea4e
Message:post-receive.automarge: use -C MERGE_HEAD instead of --no-edit

The --no-edit option was introduced by git 1.7.9 or around that. Use
"-C MERGE_HEAD" instead that is equivalent in this case but it is
supported from much time, so this script can be used on older Debians.
Changes:
Mpost-receive.automerge (2 diffs)

File differences

post-receive.automerge
3434
3535
3636
37
37
3838
3939
4040
......
5959
6060
6161
62
62
# Autocommit the local modifications, if any
git add --all
git commit -m 'Commit from post-receive.automerge'
git commit -qm 'Commit from post-receive.automerge'
# Get the name of the recently updated ref
# Commit the new HEAD
git commit --no-edit
git commit -C MERGE_HEAD

Archive Download the corresponding diff file

Branches