repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool--lib: refactor {diff,merge}_cmd logic
2013-06-17
John Keeping
m
ergeto
o
l--lib: refactor {dif
f
,mer
g
e}_cmd lo
g
ic
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
diffto
o
l
: fix dir-
d
iff when file does not exist in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
m
erge-tree: handle dire
c
tor
y
/empty conflict correc
t
ly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eeping
t/
M
a
kefil
e
: remove smo
k
e test targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
m
e
rge-tree: fix
typ
o
in "both changed
identic
a
ll
y
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keepin
g
tran
s
por
t
-helper
:
add 'signed-tags' capability
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
t
ransport-he
l
p
e
r
:
pass --sign
e
d-
t
ags=warn-
s
t
r
ip t
o
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
fast-export: add
-
-
signed-
t
a
g
s=
w
arn-strip
mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/test-lib
.
sh: fix TRASH_DIRECTORY handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
John
Keeping
merge-t
r
ee: d
o
n
't
p
rint entries that match
"local"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John
K
eeping
gitremo
t
e
-helpers
(
1
): clarify ref
s
p
ec
behaviour
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn
K
eeping
submod
u
le: print gr
a
p
h
o
ut
p
u
t next
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 un
s
t
uck
a
rgument
s
with --diff-algo
r
ithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Ke
e
ping
git-me
r
ge(1): document diff-algorithm option to merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisec
t
: avoid sig
n
ed
integer ov
e
r
f
low
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keepi
n
g
diff
c
ore-b
r
e
a
k: don't di
v
ide by
zero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t78
0
0: run --dir-
d
iff tests with and
w
i
thout sy
m
links
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7800: fix
t
ests wh
e
n
d
ifftool uses --no-symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7800: don't h
i
de grep output
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
difftool: don't over
w
rite modi
f
ied files
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
epi
n
g
t7800: move '--symlink
s
' s
p
ecific test to the
e
n
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
Joh
n
Keeping
merge-tree: fi
x
t
y
po i
n
merge-tree
.
c:
:
unr
e
sol
v
e
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
John Keepi
n
g
ref
s
.
c:
f
ix fread
erro
r
h
a
n
dlin
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Ke
e
ping
ent
r
y: fix f
i
lter look
u
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
i
n
g
t
2
003:
m
odernize st
y
le
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
Keeping
difftool --dir-diff: symlink all fil
e
s matching the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keepin
g
difftool: avoi
d
double slashes in symlink
targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
g
it-di
f
f
tool(1)
:
fix form
a
tting of --sym
l
ink descri
p
ti
o
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
J
ohn Keeping
Revert "graph
.
c
: mark private file-s
c
ope symbols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
M
a
kefile: mak
e
m
andir,
h
tm
l
dir
a
nd infodir absolut
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
Keeping
r
ebase -i: respect co
r
e
.
commentc
h
ar
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
c
o
m
bine-diff
.
c
:
t
each comb
i
ned
d
iffs about
l
ine
p
r
ef
i
x
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
K
ee
p
ing
diff
.
c:
u
se d
i
ff_
l
ine_p
r
e
f
ix() where applicable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff: add diff_line_prefi
x
f
u
n
ct
i
on
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
epin
g
diff
.
c
:
ma
k
e const
a
n
t
string arg
u
m
ents const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
d
iff: write prefix to the correct fi
l
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John
K
eeping
graph: ou
t
put pa
d
ding for merge su
b
sequent parents
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t
4038: add tes
t
s
for "
d
iff
--cc --raw <trees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
ping
bui
l
tin/apply: t
i
ghte
n
(dis)simi
l
arity index pa
r
si
n
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
Keepi
n
g
mergetool--lib: list user configured tools in '--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
ename {git- =>
git}rem
o
te-he
l
pers
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
C
odingGuideli
n
es: add Py
t
hon c
o
ding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
gi
t
-re
m
ote-te
s
t
p
y: fix path
ha
s
hing on
P
yt
h
on 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
merget
o
ol
-
-lib: don't c
a
ll "exit"
in setup_tool
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
ping
git-diff
t
ool
:
us
e
gi
t
-merget
o
o
l
-
-lib f
o
r "--tool-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
me
r
getool
:
don
'
t hardcode 'm
e
r
g
etoo
l
' in show_tool_help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-merg
e
tool: remove redundant as
s
ignm
e
n
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-merge
t
ool: move show_tool_hel
p
to mergetool
-
-lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-testpy:
ca
l
l
print as a f
u
n
ction
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
gi
t
-remote-testpy: do
n
'
t
do u
n
buffer
e
d
t
ext
I/O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-remote-testpy: hash bytes expl
i
citly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Ke
e
pin
g
svn-fe: allow svn
r
dump_sim
.
py to run wit
h
Pyt
h
on
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
g
it_
r
emote_help
e
rs
:
u
se 2to3 if buildi
n
g w
i
th Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git_remote_helpers: force rebuild if
p
ython version
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
g
it
-
cvsimpor
t
.
txt: cvsps-2
i
s d
e
prec
a
ted
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
g
i
t-for-each-ref
.
txt: 'raw'
i
s a
supported
d
ate
f
ormat
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John K
e
eping
git_remote_helpers: fix
i
nput when running under Py
t
hon
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Kee
p
i
ng
git_rem
o
te_helpers: allo
w
building
with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-17
J
ohn Ke
e
p
i
n
g
g
i
t-svn: teach find-rev
to find ne
a
r matches
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn K
e
eping
g
it-fast-import(1): re
o
rganise options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John
Keepin
g
git-fast-
i
mport(1): c
o
mbine do
c
umentation of
-
-[no
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Keeping
git
-
shor
t
log(1): document behaviour of zero-wid
t
h wra
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-08
Jo
h
n Keepi
n
g
git-fast-i
m
port(1): remove duplicate '--done' opti
o
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-12-17
J
o
h
n
Keeping
Do
c
ume
n
ta
t
ion: don'
t
link to
ex
a
mple
m
a
il add
r
e
s
ses
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-04-09
John Kee
p
ing
rebase -i continue:
don't skip commi
t
s
that only
ch
a
nge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree