repo.or.cz
/
git.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 Ho
r
d
reb
a
se --preserve-merges: keep a
l
l merge
com
m
its inc
l
u
d
ing
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
Add tests for subm
o
du
l
e
sync --recursive
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
P
h
il
Hord
T
each
--recursive t
o
submodule sync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
t
7
407: Fi
x
recursiv
e
submodu
l
e te
s
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Phil Hord
git-p
u
ll: Avoid merge
-
ba
s
e on de
t
a
c
hed head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
P
hil H
o
rd
st
a
s
h:
invoke r
e
rere in case of
c
onflict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
test: git
-
stash conflict sets up rere
r
e
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerere: D
o
cument 'rerere remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
P
hil Hord
cherry-pic
k
: N
o
advic
e
to c
o
mmit if -
-
no
-
commit
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Add test sh
o
wing git
-
f
et
c
h grok
s
g
i
tfil
e
s
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Teac
h
transport about th
e
gitfile mechanism
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Learn to handle gitfiles in en
t
er_repo
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree