git-upstream-diff - Issue 184253003: Add git-reup and friends

Side by Side Diff

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

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

Side by Side 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, 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:

OLD	NEW
1 #!/bin/bash	1 #!/bin/bash

2 # Copyright (c) 2014 The Chromium Authors. All rights reserved.	2 # Copyright (c) 2014 The Chromium Authors. All rights reserved.

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

4 # found in the LICENSE file.	4 # found in the LICENSE file.

5	5

6 . ${0/%$(basename "$0")/python_git_runner.sh} \| less -R	6 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 Word diff is problematic and it's not what people expect. Don't add it here, or if you do, make it an option. szager1 2014/02/28 22:56:39 Yeah, this is a personal preference. Providing sh Show quoted text On 2014/02/28 20:14:16, agable wrote: > Word diff is problematic and it's not what people expect. Don't add it here, or > if you do, make it an option. Yeah, this is a personal preference. Providing shorthand is OK, but it's kinda weird as default behavior.
OLD	NEW