repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maint
2013-07-03
J
oh
n
Keeping
git-config: update do
c
for --
g
e
t
with multi
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftool: fix dir-d
i
ff when file do
e
s
not exist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John
K
e
e
ping
merge-tree: handle d
i
rectory/empt
y
con
f
lict co
r
rectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
o
hn Keeping
contrib/s
u
btre
e
: don't delete rem
o
te bran
c
h
e
s
if
spli
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
h
n Keeping
t/Mak
e
file: remove smoke
test ta
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-
t
ree: f
i
x
ty
p
o in "both
changed id
e
ntically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
t
ransp
o
rt-helper: add 'signed-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
trans
p
ort-h
e
lper:
pass --signed-tag
s
=
w
arn-
s
trip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keep
i
n
g
f
a
st-
e
xport: add
--signed-tags=warn-s
t
r
ip m
o
d
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
t/t
e
s
t-lib
.
sh:
f
ix T
R
ASH_DIRECTO
R
Y handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
e
ep
i
ng
merge-tre
e
: d
o
n't print entries that m
a
tch "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
g
i
tremote-helpers
(
1)
:
clarify ref
s
pe
c
behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
epi
n
g
submo
d
ule
:
p
r
i
n
t g
r
a
p
h out
p
u
t
next to submod
u
le log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
di
f
f: allow u
n
st
u
ck
argume
n
ts wit
h
--d
i
ff-algo
r
ithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
it-m
e
r
g
e
(
1
): do
c
ument diff-algori
t
hm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
bisect: avoid s
i
g
ned integer overflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
epi
n
g
diffcore-br
e
a
k: don't
divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
e
ping
t7800: r
u
n
-
-
dir-diff
t
e
s
t
s
wit
h
and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t7800: fix
t
ests when difftool
u
ses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: don't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
dif
f
tool: don't overwr
i
te modi
f
ied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7800: move '--sy
m
lin
k
s' s
p
ecific
t
e
s
t
to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
me
r
g
e
-tree: fix typo i
n
merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Ke
e
ping
r
e
f
s
.
c: fix fread error h
a
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
n
g
ent
r
y
:
fi
x
filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
Ke
e
ping
t2003: mode
r
nize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool --dir
-
diff: symlink all files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool:
a
voi
d
double slashes
i
n symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git
-
d
i
fftool(1): fi
x
form
a
tti
n
g of --symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John K
e
eping
Reve
r
t
"
g
r
aph
.
c: mark private file-scope
s
ymbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Ke
e
pin
g
Ma
k
efile:
m
ake mandir, html
d
i
r and in
f
odir
absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
reba
s
e -i:
respect core
.
c
om
m
e
n
t
char
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
comb
i
n
e
-diff
.
c
:
teach
combined diffs
about line pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
epin
g
diff
.
c:
u
se diff_line_p
r
efix() whe
r
e applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
K
e
eping
dif
f
: add d
i
ff_li
n
e_prefix
f
unction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
diff
.
c: ma
k
e
constan
t
s
tring arguments co
n
st
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
d
i
ff: wr
i
te prefix to th
e
correc
t
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
h
n
K
e
e
pi
n
g
graph: out
p
ut pa
d
d
i
n
g
for merge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
hn Keepi
n
g
t403
8
: add tests
f
o
r
"diff
-
-cc --raw <
t
re
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John K
e
epi
n
g
builti
n
/
a
pply
:
t
i
gh
t
en
(
dis)si
m
ilari
t
y index parsi
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
mergetool--lib:
l
ist user configured tools in
'
-
-
tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
e
na
m
e {git- =>
g
it}remot
e
-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Codi
n
gGuideli
n
e
s
: a
d
d
Python
c
oding guideli
n
e
s
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Ke
e
ping
git-r
e
m
ote-testpy: f
i
x path hashing on P
y
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
merg
e
tool--lib: do
n
't
cal
l
"
e
x
it" in
s
e
tup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-difftool: use git-mergetool--lib for "
-
-
tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-merge
t
o
ol:
d
on't hardcode 'me
r
getool' in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-m
e
rgetool: remove redundant assig
n
ment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: move show_tool
_
hel
p
to m
e
rget
o
ol
-
-lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
r
emo
t
e-testpy: call print as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-te
s
tpy
:
d
on't d
o
u
n
buffere
d
text
I
/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
gi
t
-r
e
mo
t
e
-testp
y
: ha
s
h by
t
es ex
p
licitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
svn-fe:
allow svnrdu
m
p_sim
.
p
y
to
r
un
w
ith Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepi
n
g
g
it_rem
o
te_helpers: use
2
to3 if bu
i
lding wit
h
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
g
i
t_remote_hel
p
er
s
: force rebuild
if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keepi
n
g
git-cvsim
p
ort
.
txt: cvsps-2 is d
e
precated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
ohn Keeping
g
it-for-eac
h
-ref
.
txt: 'raw'
is a suppor
t
ed date
format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John K
e
eping
git_remote_helpers: fix i
n
put when ru
n
ning und
e
r Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
Keeping
git_remote_helpers:
a
llow building with Pyt
h
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keepin
g
g
i
t
-svn
:
teach find
-
rev to
f
ind near match
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
K
ee
p
ing
gi
t
-fast-import(1): reorganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fas
t
-imp
o
r
t
(1): combi
n
e docu
m
entat
i
on of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n
Keeping
git-shortlog(1)
:
document be
h
a
v
iour of zero-width w
r
ap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fast-impor
t
(
1): remo
v
e duplicate '--done' op
t
io
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
K
e
ep
i
n
g
Document
a
tion: do
n
'
t
link to example m
a
il
addre
s
ses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
J
o
hn Keeping
rebase
-
i
continue: don't skip com
m
its that onl
y
change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree