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 'ob/imap-send-ssl-verify' into maint
2013-01-14
Phil Hord
r
e
base --preserve-mer
g
es
:
keep a
l
l merge comm
i
ts including
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Phil Hord
Add tests for su
b
mo
d
ule sync --
r
ecursive
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
P
h
il
H
o
rd
T
e
a
c
h --recursive to submodule sync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Ph
i
l Hord
t74
0
7: Fi
x
recursive
submodule t
e
s
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Phil Ho
r
d
g
i
t-pull: Av
o
id merge-base on detached
h
ead
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Ph
i
l Hord
stash: in
v
oke rerere
i
n case of c
o
nflict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil H
o
rd
t
e
s
t: g
i
t
-
stash co
n
fl
i
ct sets up rer
e
re
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil H
o
rd
rerere: D
o
cument
're
r
ere re
m
aining'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
P
hil
Hord
cher
r
y-pick: N
o
advice to
c
o
mmit if
-
-no-comm
i
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
A
d
d test showi
n
g gi
t
-fetch groks gitfi
l
es
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Teach t
r
ans
p
ort ab
o
ut t
h
e
gitfi
l
e mechanism
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil H
o
r
d
Learn to h
a
ndle gi
t
files i
n
enter_
r
epo
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree