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 'maint-1.8.2' into maint
2013-05-17
Joh
n
Keepi
n
g
difftool: fix d
i
r-diff when file
d
o
e
s not exist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-
t
re
e
:
h
andle directo
r
y
/empty conflict c
o
rrectl
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepi
n
g
t/Mak
e
file: remove
s
moke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keeping
merge-tre
e
: fix typo in
"both ch
a
nged
ident
i
c
ally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keepin
g
transport-helpe
r
:
add 'sign
e
d-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
transport-helpe
r
:
p
ass --signed-ta
g
s
=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fa
s
t-export: add --signed-tags=warn-str
i
p m
o
d
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eepi
n
g
t/test-lib
.
sh: fix TRASH_DIRECTOR
Y
han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
ohn Keeping
m
e
r
ge-tre
e
: don't print
e
n
t
ries t
h
at
match "loc
a
l"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitrem
o
t
e
-he
l
pers(1): cl
a
rify refspec b
e
h
a
vio
u
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
submodu
l
e: print gra
p
h output ne
x
t
t
o s
u
bmodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow
u
nstuck arguments wit
h
-
-diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge(1): do
c
ument dif
f
-a
l
gorithm option t
o
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
epi
n
g
bis
e
ct: avoid signed inte
g
er overfl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepi
n
g
diffcore-break: don'
t
d
ivi
d
e by
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
run --dir-di
f
f te
s
ts with and wit
h
out sym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn
Keeping
t7800:
f
ix tests
w
hen d
i
fftool uses --no-s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t78
0
0:
d
on't hide grep out
p
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n Keep
i
ng
difftool: don't o
v
er
w
rite
mod
i
fied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eep
i
ng
t
78
0
0: mov
e
'--symlinks' specific t
e
st t
o
the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
Keeping
m
e
rge-
t
ree: fix typo in merge-tr
e
e
.
c::u
n
resolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n Keeping
r
e
f
s
.
c: fix fread
err
o
r han
d
li
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keep
i
ng
entry: fix
filter lo
o
kup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
t2003: m
o
derni
z
e st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Kee
p
ing
d
i
fftool --dir-
d
iff
:
symlink all files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: avoid double sl
a
shes in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
oh
n
Ke
e
ping
git-difftoo
l
(1): fix format
t
ing of --symlin
k
d
e
sc
r
i
p
tio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
Keepi
n
g
Revert "graph
.
c: mark priv
a
te fil
e
-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn
K
eep
i
ng
Makefile: make mandir, htmld
i
r and
infod
i
r a
b
solute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebas
e
-i: respe
c
t
co
r
e
.
commen
t
c
h
ar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
combine-diff
.
c: teach c
o
mb
i
n
ed d
i
f
f
s ab
o
ut line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
diff
.
c: use
d
iff_l
i
ne_prefi
x
() where a
p
plicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
diff: add
d
iff_lin
e
_
p
r
efix fun
c
ti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff
.
c: m
a
ke constant string a
r
gument
s
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
d
iff:
write
pref
i
x to the corre
c
t file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keepin
g
graph:
output padding for merg
e
subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t
4038: add tests for "
d
i
f
f --cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keeping
builtin/apply: tighten (dis)similarity
i
n
d
ex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mer
g
etool--lib: list
u
s
er
conf
i
g
u
re
d
t
ools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Keeping
Rena
m
e {git- =
>
g
it}rem
o
te-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
ohn Keeping
C
o
d
ing
G
uid
e
l
ines: add
P
ython
coding guid
e
li
n
es
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
g
i
t-remote-testpy: fix path hashing on Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool--lib
:
don't call "exit" in
setup
_
tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pin
g
g
i
t-difftool: u
s
e
g
it-mer
g
etool--lib for "--tool-hel
p
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n K
e
eping
g
i
t-merge
t
ool: don'
t
h
a
rdcode 'merge
t
ool' in sh
o
w
_
to
o
l_
h
elp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n K
e
eping
g
it-merg
e
t
o
ol: remo
v
e
redundant a
s
si
g
nment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merg
e
tool: move show_tool_help to me
r
getool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n
Keep
i
ng
git
-
r
e
mote-testpy:
call
p
r
i
nt as a
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n K
e
eping
git-remote-
t
estpy: don't do unbuffered text I
/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
ping
g
i
t-remot
e
-
t
e
s
tpy: hash
b
ytes ex
p
licitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
sv
n
-f
e
:
allow s
v
nrdump_sim
.
py to run with
P
ython 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
gi
t
_remote_he
l
pers: use 2to3 if bu
i
lding with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remo
t
e_hel
p
ers: force rebuild if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-c
v
simport
.
txt: cv
s
p
s
-2 i
s
dep
r
e
cat
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-
f
or
-
each-
r
ef
.
txt: 'raw'
i
s
a sup
p
or
t
ed date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
o
hn K
e
eping
git_re
m
o
te_helpers
:
fi
x
input when runni
n
g unde
r
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keep
i
ng
git_r
e
mote_hel
p
ers: a
l
l
ow building wi
t
h
P
ython 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
J
oh
n
Keeping
git-svn: teach find-rev to
fi
n
d
near mat
c
hes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-
f
ast-import(1): r
e
organise o
p
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn
K
eeping
g
i
t
-fast-import(1
)
: combine do
c
umentation o
f
--[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keep
i
ng
git
-
s
h
ortlog(
1
): document behaviour of z
e
r
o
-widt
h
wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keep
i
n
g
git-f
a
st-impor
t
(1): remove duplica
t
e
'--done'
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
Documentation:
d
on't
l
ink
t
o
e
xample mail ad
d
res
s
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Kee
p
ing
rebase
-i continue
:
don't s
k
i
p co
m
mits
t
hat o
n
l
y ch
a
nge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree