我有以下情形：
* ab82147 (HEAD, topic) changes
* 8993636 changes
* 82f4426 changes
* 18be5a3 (master) first
topic合并到master。 这需要我执行以下操作：
git checkout master git merge --no-ff topic* 9075cf4 (HEAD, master) Merge branch 'topic'
|\
| * ab82147 (topic) changes
| * 8993636 changes
| * 82f4426 changes
|/
* 18be5a3 first
不真正接触工作目录(或者至少通过某种方式欺骗git)。
#!/bin/bash
branch=master
# or take an argument:
# if [ $@ eq 1 ];
# branch="$1";
# fi
# make sure the branch exists
if ! git rev-parse --verify --quiet --heads "$branch" > /dev/null; then
echo "error: branch $branch does not exist"
exit 1
fi
# make sure this could be a fast-forward
if [ "$(git merge-base HEAD $branch)" == "$(git rev-parse $branch)" ]; then
# find the branch name associated with HEAD
currentbranch=$(git symbolic-ref HEAD | sed 's@.*/@@')
# make the commit
newcommit=$(echo "Merge branch '$currentbranch'" | git commit-tree $(git log -n 1 --pretty=%T HEAD) -p $branch -p HEAD)
# move the branch to point to the new commit
git update-ref -m "merge $currentbranch: Merge made by simulated no-ff" "refs/heads/$branch" $newcommit
else
echo "error: merging $currentbranch into $branch would not be a fast-forward"
exit 1
fi
newcommit= line; 它使用 commit-tree 直接创建合并提交。第一个参数是要使用的树；那就是 HEAD，即您想保留其内容的分支。提交消息在 stdin 上提供，其余参数命名新提交应具有的父项。提交的 SHA1 将打印到 stdout，因此假设提交成功，您可以捕获它，然后合并该提交（这将是快进）。如果您过于执着，可以确保 commit-tree 成功-但这应该几乎可以保证。
限制：
--no-ff 时，git 实际上会强制自己使用默认（递归）策略，但在 reflog 中编写它将是一个谎言。是的，我在玩具存储库上测试了这个，它似乎正常工作！（虽然我没有尝试过努力打破它。）
*。它们在左边的线上而不是右边的线上。正常合并会产生这样的图形：http://paste.lisp.org/+2FCS - Idan Kgit clone 到一个单独的工作副本，然后在那里进行合并，然后再 git pull 回来。这个拉取操作会是快进，并且只会影响实际发生变化的文件。完全可以在不使用git checkout、不影响提交历史或克隆的情况下进行任何合并，即使是非快进式合并也可以。秘诀在于添加第二个“工作树”，这样你就可以在同一仓库中拥有主要和次要的两个检出。
cd local_repo
git worktree add _master_wt master
cd _master_wt
git pull origin master:master
git merge --no-ff -m "merging workbranch" my_work_branch
cd ..
git worktree remove _master_wt
您现在已经将本地工作分支合并到本地 master 分支中，而不需要切换您的检出。
或者，您可以通过保存和恢复文件时间戳来直接修复症状。这有点丑陋，但编写它很有趣。
Python 时间戳保存/恢复脚本
#!/usr/bin/env python
from optparse import OptionParser
import os
import subprocess
import cPickle as pickle
try:
check_output = subprocess.check_output
except AttributeError:
# check_output was added in Python 2.7, so it's not always available
def check_output(*args, **kwargs):
kwargs['stdout'] = subprocess.PIPE
proc = subprocess.Popen(*args, **kwargs)
output = proc.stdout.read()
retcode = proc.wait()
if retcode != 0:
cmd = kwargs.get('args')
if cmd is None:
cmd = args[0]
err = subprocess.CalledProcessError(retcode, cmd)
err.output = output
raise err
else:
return output
def git_cmd(*args):
return check_output(['git'] + list(args), stderr=subprocess.STDOUT)
def walk_git_tree(rev):
""" Generates (sha1,path) pairs for all blobs (files) listed by git ls-tree. """
tree = git_cmd('ls-tree', '-r', '-z', rev).rstrip('\0')
for entry in tree.split('\0'):
print entry
mode, type, sha1, path = entry.split()
if type == 'blob':
yield (sha1, path)
else:
print 'WARNING: Tree contains a non-blob.'
def collect_timestamps(rev):
timestamps = {}
for sha1, path in walk_git_tree(rev):
s = os.lstat(path)
timestamps[path] = (sha1, s.st_mtime, s.st_atime)
print sha1, s.st_mtime, s.st_atime, path
return timestamps
def restore_timestamps(timestamps):
for path, v in timestamps.items():
if os.path.isfile(path):
sha1, mtime, atime = v
new_sha1 = git_cmd('hash-object', '--', path).strip()
if sha1 == new_sha1:
print 'Restoring', path
os.utime(path, (atime, mtime))
else:
print path, 'has changed (not restoring)'
elif os.path.exists(path):
print 'WARNING: File is no longer a file...'
def main():
oparse = OptionParser()
oparse.add_option('--save',
action='store_const', const='save', dest='action',
help='Save the timestamps of all git tracked files')
oparse.add_option('--restore',
action='store_const', const='restore', dest='action',
help='Restore the timestamps of git tracked files whose sha1 hashes have not changed')
oparse.add_option('--db',
action='store', dest='database',
help='Specify the path to the data file to restore/save from/to')
opts, args = oparse.parse_args()
if opts.action is None:
oparse.error('an action (--save or --restore) must be specified')
if opts.database is None:
repo = git_cmd('rev-parse', '--git-dir').strip()
dbpath = os.path.join(repo, 'TIMESTAMPS')
print 'Using default database:', dbpath
else:
dbpath = opts.database
rev = git_cmd('rev-parse', 'HEAD').strip()
print 'Working against rev', rev
if opts.action == 'save':
timestamps = collect_timestamps(rev)
data = (rev, timestamps)
pickle.dump(data, open(dbpath, 'wb'))
elif opts.action == 'restore':
rev, timestamps = pickle.load(open(dbpath, 'rb'))
restore_timestamps(timestamps)
if __name__ == '__main__':
main()
Bash测试脚本
#!/bin/bash
if [ -d working ]; then
echo "Cowardly refusing to mangle an existing 'working' dir."
exit 1
fi
mkdir working
cd working
# create the repository/working copy
git init
# add a couple of files
echo "File added in master:r1." > file-1
echo "File added in master:r1." > file-2
mkdir dir
echo "File added in master:r1." > dir/file-3
git add file-1 file-2 dir/file-3
git commit -m "r1: add-1, add-2, add-3"
git tag r1
# sleep to ensure new or changed files won't have the same timestamp
echo "Listing at r1"
ls --full-time
sleep 5
# make a change
echo "File changed in master:r2." > file-2
echo "File changed in master:r2." > dir/file-3
echo "File added in master:r2." > file-4
git add file-2 dir/file-3 file-4
git commit -m "r2: change-2, change-3, add-4"
git tag r2
# sleep to ensure new or changed files won't have the same timestamp
echo "Listing at r2"
ls --full-time
sleep 5
# create a topic branch from r1 and make some changes
git checkout -b topic r1
echo "File changed in topic:r3." > file-2
echo "File changed in topic:r3." > dir/file-3
echo "File added in topic:r3." > file-5
git add file-2 dir/file-3 file-5
git commit -m "r3: change-2, change-3, add-5"
git tag r3
# sleep to ensure new or changed files won't have the same timestamp
echo "Listing at r3"
ls --full-time
sleep 5
echo "Saving timestamps"
../save-timestamps.py --save
echo "Checking out master and merging"
# merge branch 'topic'
git checkout master
git merge topic
echo "File changed in topic:r3." > file-2 # restore file-2
echo "File merged in master:r4." > dir/file-3
git add file-2 dir/file-3
git commit -m "r4: Merge branch 'topic'"
git tag r4
echo "Listing at r4"
ls --full-time
echo "Restoring timestamps"
../save-timestamps.py --restore
ls --full-time
简单，按照以下3个步骤操作：
git merge origin/mastergit update-ref refs/heads/master refs/heads/topic现在你可以回到merge之前的topic提交：
3. git reset HEAD~
这里有一种“作弊”的方法。
(1): Git checkout-and-merge without touching working tree，以及(2)Update/pull a local Git branch without checking it out?。 - user456814