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
difftool: fix dir-diff when file does not exist in working tree
2013-05-17
John Keeping
difftoo
l
: fix dir-diff when fil
e
does not ex
i
st i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Joh
n
Ke
e
p
i
n
g
merg
e
-
tree: h
a
n
dle directory/empt
y
conflict cor
r
ectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eepi
n
g
t/Makefile: remove smoke test ta
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Ke
e
ping
m
e
rge-tree:
f
ix
t
ypo in "b
o
th
c
ha
n
ged i
d
enti
c
ally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
tran
s
port-helper:
a
dd 's
i
g
n
ed
-
tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
transport-helper:
pass -
-
signed-tags=warn-
s
trip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn K
e
e
ping
fast-export
:
a
dd
--signed-
t
ags=warn-strip
m
ode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
t/test
-
lib
.
sh: fix
T
RASH
_
DIRECTORY
h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tre
e
: d
o
n'
t
print en
t
ries th
a
t
m
atch
"l
o
cal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Kee
p
ing
gitre
m
ote-h
e
lpers(1): cla
r
ify r
e
f
s
pec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
oh
n
Keepin
g
submodul
e
:
print
g
raph outp
u
t
n
e
x
t
t
o
submo
d
u
l
e log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
epin
g
diff
:
al
l
ow
un
s
tuck arguments
w
ith --di
f
f-a
l
g
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge(1
)
:
document diff-algorithm opt
i
on
t
o
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn
K
eeping
bi
s
ect
:
a
v
oid signed
integer overfl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eeping
diffcore
-
b
r
eak: don't
d
ivide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t
7
8
0
0: run
--dir-d
i
ff tests with and without syml
i
nks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
e
ping
t7800:
f
ix te
s
ts w
h
en di
f
f
tool
u
se
s
--no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Ke
e
ping
t780
0
:
d
on't hide
g
rep o
u
tput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
e
ping
dif
f
tool: don't
ov
e
rwrit
e
modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t78
0
0: mov
e
'--s
y
mlin
k
s' specific test t
o
the
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Jo
h
n Keeping
mer
g
e-tree: fix typo in me
r
ge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Ke
e
ping
r
efs
.
c: fix fread
er
r
o
r ha
n
dl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: f
i
x filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t200
3
: modernize
s
ty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
K
eeping
dif
f
t
ool --dir-diff: symlink all files
m
atc
h
ing
t
he
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
difftool: a
v
oid d
o
uble slashes in s
y
mlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
ep
i
ng
g
i
t
-diffto
o
l(1
)
: fix fo
r
matting of -
-
symlink
d
escr
i
p
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keepi
n
g
Reve
r
t "gra
p
h
.
c
:
mark private file-
s
co
p
e symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keepin
g
Makefile: ma
k
e mand
i
r
,
htmld
i
r a
n
d
infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebas
e
-i: respec
t
c
ore
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
combin
e
-diff
.
c: t
e
a
c
h
c
ombined
diffs a
b
out line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
d
if
f
.
c: use diff_line_pr
e
fix() where
a
pplic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff: add diff_
l
ine
_
pref
i
x fun
c
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
diff
.
c: make
c
o
ns
t
a
nt string arguments
c
onst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
d
iff: write pr
e
f
ix to the c
o
rrect f
i
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn Keeping
graph: outpu
t
p
a
dding for
m
e
rge subsequent p
a
rent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
hn Keeping
t4038:
a
dd tes
t
s
f
or "diff --
c
c --
r
aw <trees>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John K
e
e
p
ing
b
u
iltin/appl
y
: tig
h
ten (dis)similarity i
n
dex p
a
rsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Keeping
mergetoo
l
-
-l
i
b
:
list user
configured tool
s
in '--
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
K
eeping
Rename {git- => git}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
Keep
i
ng
C
odingG
u
ide
l
i
n
es: add Python coding
g
uidel
i
nes
commit
|
commitdiff
|
tree
2013-01-28
J
o
h
n K
e
e
ping
g
it-remote
-
testp
y
: fix path h
a
shing on P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
mergetool--lib: don't call "
e
xi
t
"
in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-diffto
o
l:
use git-m
e
rge
t
ool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
i
n
g
git-
m
ergetool: d
o
n't hardcode 'merge
t
ool'
i
n show
_
tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool:
remove redundant
a
ssignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
gi
t
-m
e
rge
t
ool: mo
v
e show_tool_help to
m
erget
o
ol--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-remote-
t
estpy: call print as a
func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git
-
re
m
ote-testpy:
d
o
n
't do
unbuffered text I/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-r
e
m
o
t
e
-
testpy:
hash by
t
es e
x
plicit
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe: allow sv
n
rdump_
s
i
m
.
py
t
o r
u
n
w
ith Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
_remote_helpers
:
use
2
to3 if building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_helpers: force rebuild i
f
p
yth
o
n vers
i
o
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-cvsimpo
r
t
.
txt
:
cvsps-2 i
s
deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Joh
n
Keep
i
ng
g
i
t
-for-each-ref
.
t
x
t: 'raw' is a su
p
ported date for
m
a
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
o
hn Kee
p
ing
g
it_
r
emote_helpers: fix inpu
t
when run
n
in
g
unde
r
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Joh
n
Keeping
git_re
m
ote_helpers: allo
w
b
u
ildin
g
w
i
th Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-svn: teach f
i
nd-re
v
to fin
d
near m
a
t
c
hes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n
K
eeping
git-fast-
i
mport(1): reorganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
i
t-fas
t
-i
m
p
ort(1): combine doc
u
menta
t
i
o
n of
-
-[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
ping
git-shortlog(
1
)
:
d
ocument
b
e
h
aviour of zero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
J
o
h
n Keeping
gi
t
-fast-impo
r
t(1):
r
emo
v
e
duplicate '
-
-
d
one' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
K
ee
p
ing
Docum
e
n
t
ation: d
o
n't link to example mail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keepi
n
g
re
b
a
s
e -
i
continue: d
o
n
'
t
s
kip commits that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree