]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e70aee5 153d726)
Merge branch 'jk/pull-to-integrate'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Jul 2013 19:04:06 +0000 (12:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Jul 2013 19:04:06 +0000 (12:04 -0700)
* jk/pull-to-integrate:
  pull: change the description to "integrate" changes
  push: avoid suggesting "merging" remote changes

1  2 
builtin/push.c patch | diff1 | diff2 | blob | history
git-pull.sh patch | diff1 | diff2 | blob | history

diff --cc builtin/push.c
Simple merge
diff --cc git-pull.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.