repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Sync with v1.8.2.3
2013-05-07
John K
e
epi
n
g
merge-tree: hand
l
e directory
/
empty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
ee
p
ing
t/Make
f
i
l
e: remove s
m
oke tes
t
t
a
rge
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Ke
e
ping
merge-tre
e
: fix typo
i
n "both changed identica
l
ly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport
-
helper:
add 'signed
-
tags' c
a
pability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transp
o
rt
-
hel
p
er:
p
a
ss --signe
d
-tag
s
=
warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
fast
-
e
xport: add --signed-ta
g
s=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
t/tes
t
-lib
.
sh: fix
TRASH_DIRECTORY handli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keepin
g
merge-tree:
d
on't pr
i
nt e
n
tries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
Keepi
n
g
gitr
e
mote-helpers(1): clarify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keepin
g
subm
o
d
u
l
e:
p
ri
n
t graph o
u
tput next
to submodule
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keeping
diff:
a
llow uns
t
uc
k
arguments with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
git
-
merge(1):
d
o
cument dif
f
-a
l
gorithm
op
t
ion to mer
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Kee
p
ing
bisect: av
o
id signed inte
g
er overfl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Kee
p
ing
diffcore-break:
d
on't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t7800: run --dir-diff
t
es
t
s with and without
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7800:
fix
t
e
s
t
s when diff
t
oo
l
uses
-
-
n
o-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t78
0
0: don'
t
hide gre
p
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
difft
o
ol:
d
o
n't overwrite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '--symlinks' sp
e
cific test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Jo
h
n Kee
p
ing
mer
g
e-tree: fi
x
ty
p
o in merg
e
-tree
.
c
::unre
s
o
lved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
r
e
fs
.
c: fix frea
d
error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
entry: fix fi
l
ter looku
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
t2003:
m
ode
r
nize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
difftool --d
i
r-diff: symlink all files
m
atching th
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
Keeping
difftool:
a
void dou
b
l
e
slashes i
n
s
ymlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Ke
e
pi
n
g
git-difftool(1): fix
f
o
r
matting of --s
y
mlink d
e
s
crip
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
R
e
vert
"g
r
aph
.
c: mark private f
i
le-scope sym
b
ols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John K
e
e
p
i
n
g
Makefile: make mandir, htmldir and i
n
f
o
dir a
b
solute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
re
b
a
se -i: respect
c
ore
.
com
m
en
t
c
h
ar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
combine
-
diff
.
c
: t
e
a
ch combined diffs about line pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keepin
g
di
f
f
.
c
: u
s
e
diff
_
line_prefix() wh
e
re applic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eepi
n
g
diff: a
d
d diff_line
_
prefix
f
u
n
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
diff
.
c
:
make cons
t
an
t
string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
:
w
r
ite
p
r
efix
t
o the correct
f
ile
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
eping
gr
a
ph: output
p
a
dding for merge
subseq
u
e
nt pa
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
hn Keep
i
ng
t403
8
: add tests
fo
r
"diff --cc --raw
<
trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John K
e
e
ping
builtin/apply:
tighten (dis)simi
l
arity inde
x
par
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
ee
p
ing
mer
g
etool-
-
lib: list user configured too
l
s in '--too
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John K
e
e
p
i
ng
Rename
{
git-
=
>
g
it}
r
emote
-
helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Jo
h
n Keep
i
ng
Codin
g
Guid
e
lines
:
add Pytho
n
coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Ke
e
ping
g
it-remote-
t
estpy
:
fix pat
h
ha
s
hin
g
on Py
t
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
ng
mergetool--lib: don't call "ex
i
t"
i
n setup
_
tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-difftool:
u
s
e git-mergetool-
-
lib for
"--
t
ool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Ke
e
ping
git-mergetool: don't hardc
o
de 'mer
g
etool' i
n
show_
t
ool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-
m
ergetool: remove redunda
n
t assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
e
p
i
ng
git-mergetool: move show_tool_
h
elp to m
e
rgetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remot
e
-
test
p
y: ca
l
l
p
r
i
n
t
a
s
a func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
ping
git-remote-te
s
tpy: d
o
n
't do unbuffered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t
-remote
-
test
p
y: h
a
s
h
bytes explici
t
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn
Keeping
s
v
n-fe: allow svnrdu
m
p_sim
.
py
to run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_r
e
mote
_
helpers:
use 2to3 if bu
i
lding with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n K
e
eping
git_remote_he
l
pers
:
force rebui
l
d i
f
python
v
er
s
ion
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keepi
n
g
g
i
t-cvsimport
.
txt: cvsps-2 is depr
e
cated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Jo
h
n Kee
p
ing
git-for-each-ref
.
txt:
'
raw' is a supp
o
rted
d
ate format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keepi
n
g
git_r
e
m
o
te_he
l
pers:
f
ix
i
nput when running under Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Kee
p
ing
git_remote_helpers: allow building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keepin
g
git-svn: t
e
a
c
h find-rev
t
o find
ne
a
r
matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn Keep
i
n
g
g
i
t
-
f
a
st-i
m
p
o
rt
(
1): reor
g
anise opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John K
e
eping
git-fast
-
impo
r
t(1)
:
c
ombine docu
m
en
t
ation of
-
-[n
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
it-s
h
ortlog(1): document behaviour of zer
o
-width w
r
ap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John
K
eeping
git-fast-import(
1
): remov
e
duplicate '--done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John K
e
epi
n
g
D
o
c
u
m
e
n
tation:
don't link to
e
x
a
mple mail ad
d
resses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
Jo
h
n Keeping
rebase -i cont
i
nue: don't sk
i
p
co
m
m
its t
h
at on
l
y c
h
ange
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree