git-upstream-diff - 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-upstream-diff

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

Patch Set: Created 6 years, 10 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-upstream-diff

diff --git a/git-map b/git-upstream-diff

similarity index 61%

copy from git-map

copy to git-upstream-diff

index 6afd947086f2f9d296079d71d3d575e259e6492a..f14d1e46da4546699bb485bcd1835dc08bfd1d09 100755

--- a/git-map

+++ b/git-upstream-diff

@@ -3,4 +3,4 @@

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

# found in the LICENSE file.

-. ${0/%$(basename "$0")/python_git_runner.sh} | less -R

+git diff $(git merge-base '@{u}' HEAD) --patience --word-diff=color --word-diff-regex='\\w+|[^[:space:]]' -C -C

agable 2014/02/28 20:14:16 Word diff is problematic and it's not what people

szager1 2014/02/28 22:56:39 Yeah, this is a personal preference. Providing sh