repo.or.cz
/
git
/
jnareb-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 'jk/apply-similaritly-parsing' into maint
2013-01-14
Ph
i
l Hord
rebase --preserve-merges: kee
p
all merge co
m
mits includin
g
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phi
l
Hord
Add tests for
submodule
s
y
n
c --re
c
ursive
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil
Hord
Teach --recursive to subm
o
dule sync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Ph
i
l Hord
t7
4
0
7
: F
i
x recursive
s
ubmodule test
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Phi
l
Hord
git-
p
ull:
Avoid merge-base
o
n d
e
tached head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil H
o
rd
s
t
ash: invo
k
e rerere in case of con
f
l
ict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
test: git-stash conflict sets u
p
rerere
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Ho
r
d
rerere: Document
'r
e
rere remaining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
P
h
il
Hord
che
r
ry-pick: No a
d
vice to commit if
--no-co
m
mi
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Add test showing gi
t
-fet
c
h g
r
o
k
s
git
f
i
les
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil
H
or
d
T
each
t
r
a
nsport
a
bout t
h
e gi
t
file mechan
i
s
m
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil H
o
rd
Learn to handle g
i
t
f
i
l
e
s
i
n enter_rep
o
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree