diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:56 -0700 |
| commit | 127f98f42b0b72d2d23c97e7d783d369b6e33fa0 (patch) | |
| tree | bb22b4381ebc8d52fa4e6abde1f17d0b342dc82f /builtin/merge-recursive.c | |
| parent | Merge branch 'bw/object-id' (diff) | |
| parent | hook: add a simple first example (diff) | |
| download | tgif-127f98f42b0b72d2d23c97e7d783d369b6e33fa0.tar.xz | |
Merge branch 'ks/prepare-commit-msg-sample'
Remove an example that is now obsolete from a sample hook,
and improve an old example in it that added a sign-off manually
to use the interpret-trailers command.
* ks/prepare-commit-msg-sample:
hook: add a simple first example
hook: add sign-off using "interpret-trailers"
hook: name the positional variables
hook: cleanup script
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions