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 'jk/difftool-dir-diff-edit-fix'
2013-03-13
Phil Hord
tag: --force do
e
s
n
o
t hav
e
to warn when creating t
a
g
s
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2013-01-14
Ph
i
l Hord
rebase --p
r
eserve-merges:
k
eep al
l
mer
g
e comm
i
t
s in
c
luding
.
.
.
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
P
hil
H
ord
Ad
d
tests f
o
r submodule sync --re
c
ursive
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
Ph
i
l Ho
r
d
T
each
--re
c
ursive
t
o
s
u
bmo
d
ule sync
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-29
P
hil
H
ord
t7
4
07: Fix recursive
s
u
bmodule te
s
t
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-10-25
Phil Hord
g
i
t-pull: Avoid
merge-base on detached head
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
stash: invoke rere
r
e in cas
e
of conflict
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-08-17
Phi
l
Hord
test: git-stash conflict set
s
up r
e
rere
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2012-03-08
P
h
i
l Hord
r
erere: Document 'rerere remaini
n
g'
Signed-off-by:
Phil Hord
<phil.hord@gmail.com>
commit
|
commitdiff
|
tree
2012-02-22
Phil Hord
cherry-pick: No advice to com
m
it if --no-commit
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
A
d
d test s
h
owin
g
git-fet
c
h groks gitfiles
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Hord
Teach transport abo
u
t
the gitf
i
le mechan
i
sm
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree
2011-10-04
Phil Ho
r
d
Learn to han
d
le
g
itfi
l
es
in enter_repo
Signed-off-by:
Phil Hord
<hordp@cisco.com>
commit
|
commitdiff
|
tree