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 'tb/t0050-maint' into maint
2013-01-14
Phil Hord
rebas
e
--preserve-merges: keep al
l
merge commi
t
s i
n
c
l
uding
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
Add tests fo
r
submod
u
le
sync -
-
re
c
ur
s
ive
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil
H
o
rd
T
e
a
c
h
--recur
s
ive to submod
u
le sync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
t7407: Fix recurs
i
ve submodule test
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Ph
i
l
H
ord
git-pull:
Avoid m
e
rge-bas
e
o
n
deta
c
hed head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil
Hord
s
tash: invo
k
e rerere in c
a
se
o
f
conflict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Ph
i
l Hord
test:
g
it-stash c
o
nflict sets
up r
e
rere
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerere: Document 'r
e
rere remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Ph
i
l Hord
cherry-pic
k
: N
o
advic
e
to
comm
i
t if --no
-
commi
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil H
o
rd
Add test sho
w
ing git-fet
c
h grok
s
g
i
tfi
l
e
s
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil
Hor
d
T
e
a
ch transp
o
rt abo
u
t t
h
e gitfile me
c
h
a
nism
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phi
l
Hord
Learn to handle g
i
tfile
s
in ent
e
r_re
p
o
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree