H0llyW00dzZ/git: Git Source Code Mirror - This is a publish-only repository but pull requests can be turned into patches to the mailing list via GitGitGadget (https://gitgitgadget.github.io/). Please follow Documentation/SubmittingPatches procedure for any of your improvements. - git

mirror of https://github.com/git/git.git synced 2025-04-12 08:22:37 +00:00

Go to file

Shawn O. Pearce ead49f5a4f git-gui: Format tracking branch merges as though they were pulls

If we are merging a tracking branch we know exactly what remote URL
that branch is fetched from, and what its name is on that remote
repository.  In this case we can setup a merge message that looks
just like a standard `git-pull $remote $branch` operation by filling
out FETCH_HEAD before we start git-merge, and then run git-merge just
like git-pull does.

I think the result of this behavior is that merges look a lot nicer
when the came off of local tracking branches, because they no longer
say "commit 'origin/...'" to describe the commit being merged but
instead now mention the specific repository we fetched those commits
from.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

2007-07-25 04:54:53 -04:00

lib

git-gui: Format tracking branch merges as though they were pulls

2007-07-25 04:54:53 -04:00

.gitignore

git-gui: Refactor into multiple files to save my sanity

2007-05-07 23:35:48 -04:00

git-gui.sh

git-gui: Refactor current branch menu items to make i18n easier

2007-07-23 01:11:08 -04:00

GIT-VERSION-GEN

Merge branch 'maint'