git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1ce594b
677b962
)
Linux-omap rebuilt: Rebuilt tmp-merge with the pending branches
author
Tony Lindgren
<tony@atomide.com>
Fri, 20 Apr 2012 00:21:23 +0000
(17:21 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 20 Apr 2012 00:21:23 +0000
(17:21 -0700)
$ git checkout -b tmp-rebuild-
1334881269
linus
$ git merge -m "Merge fixes fixes-non-critical tmp-merge dt testing-misc testing-board cbus" fixes fixes-non-critical tmp-merge dt testing-misc testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1334881269
To view the changes since the last rebuild, please do
$ git diff
677b962f844a8d07d64dabd30c208e96fc22dea2
..
1ce594b875fd71cd67a378994f4eec970adc0621
arch/arm/*omap*/
Trivial merge