git-mark-merge-base - Issue 184253003: Add git-reup and friends

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: git-mark-merge-base

Issue 184253003: Add git-reup and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@freeze_thaw

Patch Set: fix pylint Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: git-mark-merge-base

diff --git a/git-cl b/git-mark-merge-base

similarity index 64%

copy from git-cl

copy to git-mark-merge-base

index 7b17d25bee415ca610d6b23fe5034900cf046ef9..035197fafce4772090eae951af57173724ef8dc0 100755

--- a/git-cl

+++ b/git-mark-merge-base

@@ -3,7 +3,6 @@

# Use of this source code is governed by a BSD-style license that can be

# found in the LICENSE file.

-# git_cl.py -- a git-command for integrating reviews on Rietveld

+# git_mark_merge_base.py -- Manually set the merge base for the current branch.

. $(type -P python_git_runner.sh)

« no previous file with comments | « docs/src/git-upstream-diff.txt ('k') | git-new-branch » ('j') | no next file with comments »