repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
pull: change the description to "integrate" changes
2013-07-08
John Keeping
p
u
ll: c
h
ange the desc
r
iption to "in
t
egrate" ch
a
nges
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keepi
n
g
p
ush: avoid su
g
ge
s
t
ing "merging" remo
t
e c
h
anges
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftool
:
fix dir-diff w
h
en fil
e
does not exist i
n
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n Keep
i
n
g
m
e
rge-tre
e
: handle d
i
rector
y
/empty conflict corr
e
ctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keeping
t/M
a
k
e
file: remove smoke
t
e
s
t targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Kee
p
ing
m
e
r
g
e
-tree: fix typ
o
i
n "both chang
e
d
ident
i
c
ally"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
t
rans
p
ort-helper: add 'signed-ta
g
s'
cap
a
bility
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
tran
s
port-helpe
r
: pass
-
-
signed-tags=warn-stri
p
to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
fast-ex
p
ort: add --signed-ta
g
s=warn
-
str
i
p mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/te
s
t
-
lib
.
sh: fix TRAS
H
_DIRECTORY handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n Keeping
merge-tree: don't pri
n
t
e
n
tries
t
hat match
"loca
l
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote-h
e
lpers(1): clar
i
fy r
e
fspec beh
a
vi
o
ur
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: pri
n
t gr
a
ph output 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
u
ck argument
s
with --diff-algori
t
hm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keep
i
ng
git-merge(1):
d
ocumen
t
diff-
a
lg
o
rithm
o
ption
t
o me
r
ge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn
K
eepin
g
bi
s
ec
t
: avoid signed integer
ov
e
rf
l
ow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Kee
p
ing
di
f
f
core
-
bre
a
k:
don't divide b
y
zero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t7800: run --di
r
-diff tests with an
d
without syml
i
nks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n
Ke
e
ping
t7800
:
fix tests when difftool uses --no
-
symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t
7800: don't hi
d
e
g
rep output
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
difft
o
ol:
d
on't o
v
er
w
ri
t
e modified f
i
les
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keepi
n
g
t7800: move '--
s
ym
l
i
nks'
spe
c
ific t
e
s
t
to th
e
end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
John Kee
p
i
n
g
m
e
rge-tree
:
fix typo in merge-tree
.
c
::unr
e
sol
v
ed
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n Keeping
refs
.
c
:
fi
x
fr
e
ad error handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keep
i
ng
entry: fix fi
l
ter
lookup
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n Keeping
t2
0
03:
moderni
z
e style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
K
e
e
ping
d
i
ffto
o
l
--dir-diff: syml
i
nk al
l
file
s
matching
t
he
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
difftool: avoid d
o
uble slashe
s
in symlink tar
g
ets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
git-di
f
ftoo
l
(1
)
: f
i
x formattin
g
of --symlink
d
escription
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c: ma
r
k
private fi
l
e-scope s
y
mbols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
John Ke
e
p
i
n
g
Ma
k
efile: make mandir, htmldir and infodir absolute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keeping
re
b
ase -i: respect core
.
comme
n
tchar
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
combine-diff
.
c
:
teach c
o
mbined diffs about
line prefix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keep
i
ng
diff
.
c
: use diff_line_prefix() where appli
c
abl
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
oh
n
Keeping
dif
f
: add diff_line_p
r
efix function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
e
ping
diff
.
c: make cons
t
ant
string arguments const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
ff: write prefix to t
h
e
correct file
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John Keep
i
n
g
graph:
o
utput p
a
d
d
i
n
g for merge
subse
q
uent
p
a
rents
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John
Keeping
t4038: add tests
for "di
f
f --
c
c
-
-raw <t
r
ees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n
K
eeping
builtin/apply: tighten (dis)simila
r
ity index parsing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Ke
e
pi
n
g
merge
t
ool--lib:
list us
e
r conf
i
g
u
red t
o
ol
s
in '--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn Keeping
Rena
m
e {
g
it-
=
> git}remote-
h
elp
e
rs
.
tx
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John K
e
e
ping
CodingGuideline
s
:
a
dd Pyth
o
n coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn
Keepi
n
g
git-remote-testp
y
: fix path hashing o
n
Python
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergeto
o
l--lib: don't ca
l
l "exit" in setup_tool
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-diff
t
ool: u
s
e g
i
t-merg
e
tool--lib for "--
t
o
o
l-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-m
e
rgeto
o
l:
don't
h
a
rdc
o
de 'mergetool'
i
n show_tool
_
help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-
m
ergetool: re
m
ove
red
u
n
dant a
s
signment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: move sho
w
_tool_h
e
l
p
t
o
mergetool--
l
ib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-re
m
ot
e
-test
p
y: call print as
a
function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-tes
t
p
y: don'
t
do unbuffered text I
/
O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
ep
i
ng
git-remote-testpy: hash bytes explicitly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe: all
o
w
svnrdump_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
git_remote_hel
p
er
s
: use 2to3 if building with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_re
m
ote_helpers: forc
e
r
e
build
if p
y
thon version
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
John Ke
e
p
i
n
g
git-cv
s
i
m
p
o
r
t
.
txt: cvsps-2 is dep
r
ecated
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-for
-
each-ref
.
t
x
t: 'raw' is a sup
p
o
rted
d
ate format
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote
_
h
e
l
p
ers
:
fix inpu
t
when running under Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Keep
i
ng
git_re
m
ote_helpers:
allow building with Py
t
hon 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-17
J
o
hn Keeping
gi
t
-
svn: teac
h
f
ind-rev to
f
i
n
d
near matches
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
it-fa
s
t-import(1): re
o
r
ga
n
ise options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-
i
m
port(1): c
o
mbine docum
e
ntatio
n
of --[no
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Kee
p
ing
g
i
t-sh
o
rtlog(1): docume
n
t
behav
i
our o
f
ze
r
o-width wrap
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fast-import(1):
r
emove dupli
c
at
e
'--don
e
' op
t
ion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-12-17
John
K
e
epin
g
Documentation:
don't l
i
nk to
e
xample m
a
il ad
d
r
esses
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
r
ebase
-
i
c
on
t
inue:
don'
t
skip co
m
mits
that on
l
y change
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree