tools/git/post-merge - Issue 1841863002: Update monet.

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: tools/git/post-merge

Issue 1841863002: Update monet. (Closed) Base URL: https://github.com/domokit/monet.git@master

Patch Set: Created 4 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: tools/git/post-merge

diff --git a/tools/git/post-merge b/tools/git/post-merge

new file mode 100755

index 0000000000000000000000000000000000000000..8b774ce65937209b2d54fde9f1585ea5d1a3270e

--- /dev/null

+++ b/tools/git/post-merge

@@ -0,0 +1,12 @@

+#!/bin/bash

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

+# found in the LICENSE file.

+script=$(readlink $0)

+source $(dirname ${script:-$0})/git-utils.sh

+if git diff-tree ORIG_HEAD HEAD | grep -qs $'\tDEPS$'; then

+ warn "DEPS has changed; you probably need to re-run gclient sync."

+fi

« no previous file with comments | « tools/git/post-checkout ('k') | tools/git/update-copyrights.sh » ('j') | no next file with comments »