repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
remote-hg: remove files before modifications
2013-05-17
John Keeping
d
ifftool: fix dir-diff wh
e
n f
i
le
do
e
s n
o
t
exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: handle directory/empty co
n
flict corr
e
ctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepin
g
t
/Makefile: remo
v
e smoke t
e
st target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eepi
n
g
merg
e
-tree: fix typo i
n
"both changed i
d
entically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
e
ping
transport-helper: ad
d
'
s
ign
e
d-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eepin
g
tran
s
port-helpe
r
:
pass --si
g
ned-tags=warn-strip t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
in
g
f
ast-export: a
d
d
--signed-
t
ag
s
=warn-strip mod
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/
t
es
t
-lib
.
sh:
fix
TRASH_DIRE
C
TORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't prin
t
entri
e
s th
a
t match "loc
a
l"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
hn Keeping
gitremote-helpers(1
)
: clarify refspec beha
v
iour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule:
print graph o
u
tput next
to submodul
e
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keeping
diff: allow unstuck
arguments with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
ng
git
-
merge(
1
): document di
f
f
-algorithm option to me
r
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keep
i
ng
bisect: avoid
s
i
g
ned integer
o
v
erflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keep
i
ng
diffcor
e
-br
e
ak: don'
t
divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
K
eeping
t78
0
0:
r
un --dir-diff t
e
st
s
with
a
n
d
withou
t
symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800
:
fix tests when difft
o
ol u
s
es --
n
o-s
y
mli
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7
8
00: d
o
n't hide
grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keep
i
ng
d
ifft
o
ol
:
don't o
v
e
rwrite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '--symlinks' spe
c
ifi
c
te
s
t to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Joh
n
K
e
eping
merge-
t
ree: fix ty
p
o
i
n merge-tree
.
c::unresol
v
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
r
e
fs
.
c: f
i
x fre
a
d
e
rror
h
andling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix filter
l
oo
k
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: modernize sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool --dir-diff: sy
m
lin
k
a
ll files ma
t
c
h
i
n
g
t
he
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
e
pi
n
g
d
ifftool: a
v
oid dou
b
le sl
a
s
h
es in sym
l
ink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
g
it
-
difftool(1): fix formatt
i
ng of --symlink
d
escripti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keepi
n
g
Revert "graph
.
c:
mark private file
-
s
c
ope s
y
mbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Jo
h
n K
e
eping
Makefile: make mandir,
htm
l
dir and
i
nfodir
a
bsolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
rebase -i:
r
espect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n K
e
eping
comb
i
ne
-
diff
.
c: teac
h
comb
i
n
ed
diff
s
ab
o
ut line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keepin
g
diff
.
c: us
e
d
if
f
_line_prefix() w
h
ere appl
i
c
a
b
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff: ad
d
diff_line_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make constant strin
g
argument
s
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
diff:
w
rite pref
i
x to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keeping
gr
a
ph: outpu
t
paddi
n
g for merg
e
subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn Kee
p
i
ng
t4038: add test
s
for "diff
--cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
builtin/apply: tighten
(
dis)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Kee
p
ing
m
ergetool--lib: li
s
t
use
r
c
o
n
figured tools
in '-
-
to
o
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
K
eeping
Renam
e
{git- => git
}
rem
o
te-
h
elp
e
rs
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn K
e
eping
Co
d
ingGuidelines: add Python coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
g
i
t-remot
e
-testpy: fix path hashing on P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
K
eeping
me
r
g
e
tool--li
b
: don't call
"
exit" in se
t
up_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-dif
f
to
o
l: us
e
git-merg
e
tool
-
-li
b
for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
gi
t
-me
r
getool:
don't hardc
o
de 'm
e
rgetool' in show_tool
_
he
l
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
g
i
t-mergetool: remo
v
e red
u
ndant a
s
signment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-mergetool: move show_tool_h
e
l
p to m
e
rgetool--
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Keeping
git-remote-test
p
y
: call p
r
int as a func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-remote-testpy: do
n
'
t do unbuffered
t
ext I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eepi
n
g
git-remote-testpy:
h
ash byt
e
s explic
i
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe: allow
s
v
nrdump_sim
.
p
y to run with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
g
i
t_remot
e
_helper
s
: u
s
e
2to3 if
b
uilding with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git_rem
o
te_he
l
pe
r
s: force
r
e
b
uild if python vers
i
on
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John K
e
eping
git-cvsim
p
ort
.
tx
t
: cvsps-2
i
s deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-f
o
r
-e
a
ch-ref
.
txt: 'raw' is a sup
p
orted date
f
ormat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
g
i
t
_
remote
_
h
elpers: f
i
x input when runni
n
g
u
n
der Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keepin
g
git_remot
e
_
helpers: allow bui
l
ding w
i
th P
y
th
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
Jo
h
n Keep
i
ng
g
i
t-sv
n
: teach fin
d
-
rev to
find
near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
Keeping
git-fast-import(1): reor
g
anis
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-impo
r
t(1)
:
combine
doc
u
me
n
tation
of
--[
n
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-shortlog(1): docum
e
nt beha
v
iour of zero-w
i
dth w
r
ap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fast-import(1):
r
e
m
ove
d
u
plica
t
e '--done
'
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
Documentat
i
o
n: don't link
t
o
e
xample mail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
rebase -i continue: don't s
k
ip comm
i
t
s th
a
t only c
h
ange
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree