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
t3600: test behavior of reverse-d/f conflict
2013-03-13
Phi
l
Hord
tag:
-
-force does not ha
v
e to w
a
rn whe
n
c
r
eating tags
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-01-14
Phil Ho
r
d
reba
s
e --p
r
eserve-me
r
g
e
s: keep all me
r
ge co
m
mits in
c
luding
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Ph
i
l Hord
Add
t
ests
for submodule sync --recursiv
e
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
T
each --recurs
i
ve to subm
o
d
u
l
e sync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Ph
i
l
H
ord
t7407: Fix recursive submodule t
e
s
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Phil Hord
g
it-pull: Avoid merge
-
base on detache
d
head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil
H
ord
st
a
sh:
i
nvo
k
e rere
r
e
in case of conflict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
test: git-s
t
ash conflict sets u
p
rerere
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
re
r
ere: Do
c
ument 'rerere remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Phil Hord
cherry-p
i
ck: No advice
t
o
commit if
-
-
no-commit
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil
Hord
Add
t
est showing git-fet
c
h
g
r
o
k
s
gi
t
files
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hor
d
Te
a
ch
t
r
ansport about the
g
itfile mechanism
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phi
l
Hord
Learn to handle g
i
tfiles
i
n enter_repo
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree