git-hacks

git-hacks Commit Details

Date:2014-02-20 10:14:37 (5 years 9 months ago)
Author:Nicola Fontana
Branch:master
Commit:b4a1e64cc8b6ce7eb0ef912376be54138e4c360e
Parents: 4dbfe17b10e3f31e6148533bcb11453be4bc276d
Message:post-receive.automerge: update doc

Changes:
Mpost-receive.automerge (1 diff)

File differences

post-receive.automerge
66
77
88
9
10
11
9
10
11
12
1213
1314
1415
# conflicting file. To be able to do this, HEAD must not be in a
# detached state.
#
# It can be used in a two-way file synchronization process on multiple
# repositories. For example, on every local repository you can use a
# script similar to the following one:
# This hook has been specifically developed for two-way file
# synchronization with git repositories. For example, after having
# enabled it on a remote repository, you can use a script similar to
# the following one on every repository you want to keep in sync:
#
# ----->8------
# #! /bin/sh

Archive Download the corresponding diff file

Branches