diff options
author | Junio C Hamano <junkio@cox.net> | 2006-11-03 00:23:52 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-11-03 00:23:52 -0800 |
commit | 407e1d6e127357a0fbe1a9f91ee616a2b7ec29db (patch) | |
tree | a2efb8d179aff14b73db024f936ef0dd092b7a7c /git-revert.sh | |
parent | aac91b7eeae4e8cf6521a5370caf03eb432ce492 (diff) | |
parent | 6255ef08ae746bdad34851297a989ad6f36f6a21 (diff) | |
download | git-407e1d6e127357a0fbe1a9f91ee616a2b7ec29db.tar.gz git-407e1d6e127357a0fbe1a9f91ee616a2b7ec29db.tar.xz |
Merge branch 'master' into np/index-pack
* master: (90 commits)
gitweb: Better support for non-CSS aware web browsers
gitweb: Output also empty patches in "commitdiff" view
gitweb: Use git-for-each-ref to generate list of heads and/or tags
for-each-ref: "creator" and "creatordate" fields
Add --global option to git-repo-config.
pack-refs: Store the full name of the ref even when packing only tags.
git-clone documentation didn't mention --origin as equivalent of -o
Minor grammar fixes for git-diff-index.txt
link_temp_to_file: call adjust_shared_perm() only when we created the directory
Remove uneccessarily similar printf() from print_ref_list() in builtin-branch
pack-objects doesn't create random pack names
branch: work in subdirectories.
gitweb: Use 's' regexp modifier to secure against filenames with LF
gitweb: Secure against commit-ish/tree-ish with the same name as path
gitweb: esc_html() author in blame
git-svnimport: support for partial imports
link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure
Move deny_non_fast_forwards handling completely into receive-pack.
revision traversal: --unpacked does not limit commit list anymore.
Continue traversal when rev-list --unpacked finds a packed commit.
...
Diffstat (limited to 'git-revert.sh')
-rwxr-xr-x | git-revert.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/git-revert.sh b/git-revert.sh index 4fd81b6ed..6eab3c72d 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -145,9 +145,18 @@ git-read-tree -m -u --aggressive $base $head $next && result=$(git-write-tree 2>/dev/null) || { echo >&2 "Simple $me fails; trying Automatic $me." git-merge-index -o git-merge-one-file -a || { + mv -f .msg "$GIT_DIR/MERGE_MSG" + { + echo ' +Conflicts: +' + git ls-files --unmerged | + sed -e 's/^[^ ]* / /' | + uniq + } >>"$GIT_DIR/MERGE_MSG" echo >&2 "Automatic $me failed. After resolving the conflicts," echo >&2 "mark the corrected paths with 'git-update-index <paths>'" - echo >&2 "and commit with 'git commit -F .msg'" + echo >&2 "and commit the result." case "$me" in cherry-pick) echo >&2 "You may choose to use the following when making" |