| commit | 51791f97d8e585e1468e7c61d0687a832c8564d8 | |
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | |
| Wed, 26 Mar 2014 22:05:38 +0000 (26 22:05 +0000) | ||
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | |
| Wed, 26 Mar 2014 22:05:38 +0000 (26 22:05 +0000) | ||
| tree | fc183d1b0298552c90f4ae3827bb006eb9d14071 | treesnapshot (tar.gz zip) |
| parent | 5117e50c39e9c2f4d06096ffea6878642132d057 | commitdiff |
git-hooks/pre-commit: Allow merging deps2submodules changes from upstream
This also checks the 2nd parent during a merge, to allow commiting a
merge that contains newer versions of the submodules. In particular
merging chromium master into a local branch will now work.
TEST=git checkout -b test origin/master~200
git merge --no-ff --no-commit origin/master
git commit
Review URL: https://codereview.chromium.org/192443006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259711 0039d316-1c4b-4281-b951-d872f2087c98
This also checks the 2nd parent during a merge, to allow commiting a
merge that contains newer versions of the submodules. In particular
merging chromium master into a local branch will now work.
TEST=git checkout -b test origin/master~200
git merge --no-ff --no-commit origin/master
git commit
Review URL: https://codereview.chromium.org/192443006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259711 0039d316-1c4b-4281-b951-d872f2087c98
| build/git-hooks/pre-commit | diffblobblamehistory |