diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-13 15:45:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-13 15:45:38 -0700 |
| commit | 447d0cca45920bbe409361bb532444f810c75546 (patch) | |
| tree | 5dcc6d9b52da50102b842e57c1dbcd3c1274f475 /git-am.sh | |
| parent | fa6200fc02ad79124322b97fc26f79467789838f (diff) | |
| parent | 191a8e32b38c7ff0dd884df7bd323b7a5bd4336c (diff) | |
| download | git-447d0cca45920bbe409361bb532444f810c75546.tar.gz | |
Merge branch 'maint' to sync with 1.5.6.3
* maint:
GIT 1.5.6.3
git-am: Do not exit silently if committer is unset
t0004: fix timing bug
git-mailinfo: document the -n option
Fix backwards-incompatible handling of core.sharedRepository
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -30,7 +30,8 @@ set_reflog_action am require_work_tree cd_to_toplevel -git var GIT_COMMITTER_IDENT >/dev/null || exit +git var GIT_COMMITTER_IDENT >/dev/null || + die "You need to set your committer info first" stop_here () { echo "$1" >"$dotest/next" |