repo.or.cz
/
alt-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/cvsimport-does-not-work-with-cvsps3' into maint
2013-01-14
P
hil Hord
rebase --prese
r
ve-merges: keep all merge commits including
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
P
h
il
H
ord
Add test
s
f
or
submodu
l
e
sync
-
-
recur
s
ive
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
P
hil
Ho
r
d
T
e
ac
h
--recur
s
iv
e
to
submod
u
le s
y
nc
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Ph
i
l Hord
t7407
:
Fix
recursi
v
e submodule test
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Phil Hord
git-pull
:
Av
o
i
d
mer
g
e
-ba
s
e
on
detached h
e
ad
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Ph
i
l Hord
sta
s
h: i
n
voke rerere in case of
confli
c
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
t
e
st:
g
i
t-
s
tash con
f
lict sets up rerere
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
P
h
i
l Hord
r
erere: Documen
t
'rere
r
e rema
i
ning'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
P
h
il Hord
cherry-pick: No advice to commit if --no-com
m
it
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Add test showin
g
git-fetch groks
g
i
tfile
s
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil
Hord
Te
a
ch tran
s
port a
b
out the g
i
tfil
e
mechanism
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Ph
i
l
Hord
Learn
to h
a
ndle gitfiles in ent
e
r_r
e
po
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree