repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ph/rebase-preserve-all-merges' into maint
2013-01-14
Phil H
o
rd
re
b
ase --p
r
eserve-m
e
r
g
e
s: ke
e
p al
l
merge commits incl
u
ding
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Ho
r
d
A
d
d tests
for su
b
mo
d
ul
e
sync --r
e
cursive
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
Te
a
ch --recursive to submodu
l
e sy
n
c
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
P
h
il Hord
t740
7
:
F
ix recursive submodule
t
e
s
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Phil
Hord
git-pul
l
: Avoid merge
-
base on det
a
ched head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
sta
s
h:
i
nvoke
rerere i
n
case
of conflic
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil
Hord
test
:
git-stash confli
c
t sets up re
r
er
e
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerer
e
:
Document 'r
e
rere remai
n
in
g
'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Phil
H
ord
cherry-pick: N
o
ad
v
i
ce to
commit
i
f
-
-
no-commit
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil H
o
rd
A
dd
test
s
h
owing git-fet
c
h grok
s
g
i
tfiles
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Teach tr
a
nsport a
b
out the gitfile m
e
chani
s
m
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Learn
to handle git
f
iles in enter_
r
e
p
o
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree