| commit | b5b6b434527e5f0df43f994d690a48dad1fb4555 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 24 Jan 2007 21:51:59 +0000 (24 16:51 -0500) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 25 Jan 2007 05:25:31 +0000 (25 00:25 -0500) | ||
| tree | 760ac214f934bf7725033a8fc9e7872259268b37 | treesnapshot (tar.gz zip) |
| parent | 0fd49d0a7d579722bd1a0a1645afc16646b05794 | commitdiff |
git-gui: Implement basic branch switching through read-tree.
If the user selects a different branch from the Branch menu, or asks
us to create a new branch and immediately checkout that branch we
now perform the update of the working directory by way of a 2 way
read-tree invocation.
This emulates the behavior of `git checkout branch` or the behavior
of `git checkout -b branch initrev`. We don't however support the
-m style behavior, where a switch can occur with file level merging
performed by merge-recursive. Support for this is planned for a
future update.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
If the user selects a different branch from the Branch menu, or asks
us to create a new branch and immediately checkout that branch we
now perform the update of the working directory by way of a 2 way
read-tree invocation.
This emulates the behavior of `git checkout branch` or the behavior
of `git checkout -b branch initrev`. We don't however support the
-m style behavior, where a switch can occur with file level merging
performed by merge-recursive. Support for this is planned for a
future update.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| git-gui.sh | diffblobblamehistory |