git/lib at 774173aa5f24023a82ce79f2a71fe3f664b747ad - git

Tree: 774173aa5f

Shawn O. Pearce 774173aa5f git-gui: Fast-forward existing branch in branch create dialog If the user elects to create a local branch that has the same name as an existing branch and we can fast-forward the local branch to the selected revision we might as well do the fast-forward for the user, rather than making them first switch to the branch then merge the selected revision into it. After all, its really just a fast forward. No history is lost. The resulting branch checkout may also be faster if the branch we are switching from is closer to the new revision. Likewise we also now allow the user to reset the local branch if it already exists but would not fast-forward. However before we do the actual reset we tell the user what commits they are going to lose by showing the oneline subject and abbreviated sha1, and we also let them inspect the range of commits in gitk. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>		18 years ago
..
blame.tcl	Merge branch 'maint'	18 years ago
branch.tcl	git-gui: Optimize for newstyle refs/remotes layout	18 years ago
branch_create.tcl	git-gui: Fast-forward existing branch in branch create dialog	18 years ago
branch_delete.tcl	git-gui: Refactor the delete branch dialog to use class system	18 years ago
branch_rename.tcl	Merge branch 'maint'	18 years ago
browser.tcl	git-gui: Save geometry before the window layout is damaged	18 years ago
choose_rev.tcl	git-gui: Allow users to match remote branch names locally	18 years ago
class.tcl	git-gui: Teach class system to support [$this cmd] syntax	18 years ago
commit.tcl	git-gui: Honor rerere.enabled configuration option	18 years ago
console.tcl	git-gui: Save geometry before the window layout is damaged	18 years ago
database.tcl	git-gui: Convert browser, console to "class" format	18 years ago
diff.tcl	git-gui: Allow as few as 0 lines of diff context	18 years ago
error.tcl	git-gui: Refactor into multiple files to save my sanity	18 years ago
index.tcl	git-gui: Refactor into multiple files to save my sanity	18 years ago
merge.tcl	git-gui: Unlock the index when cancelling merge dialog	18 years ago
option.tcl	Merge branch 'maint'	18 years ago
remote.tcl	git-gui: Maintain remote and source ref for tracking branches	18 years ago
remote_branch_delete.tcl	git-gui: Correct resizing of remote branch delete dialog	18 years ago
shortcut.tcl	git-gui: Ensure windows shortcuts always have .bat extension	18 years ago
transport.tcl	git-gui: GUI support for running 'git remote prune <name>'	18 years ago