diff options
author | Junio C Hamano <junkio@cox.net> | 2006-05-23 15:07:47 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-23 15:07:47 -0700 |
commit | dcaad49c928f047d5ffa1c5a1753aff6e87f16b5 (patch) | |
tree | a688a7fcc3922b37fb72a5d52c00928ac5667bdb /git-am.sh | |
parent | 33b292610dea9f94c986eb88f12e503f5b8375dd (diff) | |
parent | 6858d494926437ad7b7e9199ea39953eb90c7bab (diff) | |
download | git-dcaad49c928f047d5ffa1c5a1753aff6e87f16b5.tar.gz git-dcaad49c928f047d5ffa1c5a1753aff6e87f16b5.tar.xz |
Merge branch 'sp/reflog' into next
* sp/reflog:
Enable ref log creation in git checkout -b.
Create/delete branch ref logs.
Include ref log detail in commit, reset, etc.
Change order of -m option to update-ref.
Correct force_write bug in refs.c
Change 'master@noon' syntax to 'master@{noon}'.
Log ref updates made by fetch.
Force writing ref if it doesn't exist.
Added logs/ directory to repository layout.
General ref log reading improvements.
Fix ref log parsing so it works properly.
Support 'master@2 hours ago' syntax
Log ref updates to logs/refs/<ref>
Convert update-ref to use ref_lock API.
Improve abstraction of ref lock/write.
Diffstat (limited to 'git-am.sh')
-rwxr-xr-x | git-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -413,7 +413,7 @@ do parent=$(git-rev-parse --verify HEAD) && commit=$(git-commit-tree $tree -p $parent <"$dotest/final-commit") && echo Committed: $commit && - git-update-ref HEAD $commit $parent || + git-update-ref -m "am: $SUBJECT" HEAD $commit $parent || stop_here $this if test -x "$GIT_DIR"/hooks/post-applypatch |