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
Merge branch 'da/difftool-fixes' into next
2013-03-04
John Keeping
Revert "gra
p
h
.
c:
m
ark
p
r
ivate file-sc
o
pe symbols
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: respe
c
t c
o
re
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
c
o
mbi
n
e
-diff
.
c: t
e
ach combined
dif
f
s about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
ff
.
c: use diff_line_prefix() where app
l
icable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keepi
n
g
diff: add d
i
ff_line_p
r
e
fix
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
ee
p
ing
diff
.
c
: make constant str
i
n
g
a
rguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eepi
n
g
diff
:
write prefi
x
t
o the correct f
i
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn Keeping
g
raph: outpu
t
pad
d
in
g
for mer
g
e subse
q
uent
p
aren
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
Jo
h
n Keeping
t
4038
:
add tests for "diff --
c
c --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
builtin/apply:
t
ighten (di
s
)si
m
ilarity index parsi
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
er
g
etool--lib: list user conf
i
g
u
red tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Kee
p
ing
R
e
na
m
e
{git- => g
i
t}
r
emote-helpers
.
t
x
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Co
d
i
ngGu
i
d
elines: a
d
d
Pyth
o
n co
d
i
ng guidel
i
nes
commit
|
commitdiff
|
tree
2013-01-28
J
ohn K
e
eping
git-remote-testpy: fix
p
ath h
a
shin
g
on Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool--lib
:
don'
t
ca
l
l "exit" in se
t
u
p
_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eep
i
n
g
g
i
t
-
d
ifftool: use gi
t
-mergetool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n K
e
eping
git-mergetool: don't
hardcode 'mer
g
etool' in
s
how_to
o
l_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
i
n
g
git-merg
e
t
o
ol: remove redundant assi
g
nme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git
-
mergetool: move show_tool_help
t
o
mergetool--li
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Kee
p
ing
git-remote-testpy: call p
r
int as
a
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Kee
p
ing
git-rem
o
te-t
e
stpy: don't do unbuff
e
red text
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-r
e
mote-test
p
y: hash bytes e
x
plicit
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
svn-fe: allow svnr
d
u
m
p_sim
.
py to ru
n
w
ith Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Kee
p
ing
git
_
r
emo
t
e
_
helpers: use 2t
o
3 if
building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git_remote_h
e
lpers: fo
r
ce
r
e
b
uild
if pyth
o
n v
e
rsi
o
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Kee
p
ing
gi
t
-cvsimport
.
t
x
t: cv
s
ps-2 is depr
e
cated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-for-
e
a
ch-ref
.
txt: 'raw' is a suppor
t
ed d
a
te
f
ormat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
K
eeping
g
it_remo
t
e_helpers: fi
x
inpu
t
when ru
n
ning unde
r
Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Ke
e
ping
git_remote_hel
p
ers: al
l
o
w
buildin
g
wi
t
h Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-svn: te
a
ch find-r
e
v to fin
d
n
ear matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-import(1):
reorganise o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
K
eeping
git-fast-import(1):
c
o
mbine do
c
umentation of --
[
no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepi
n
g
git-s
h
or
t
l
og(1): document beha
v
i
o
ur of zero-
w
id
t
h
wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
Joh
n
Kee
p
ing
git-fast-import(1): re
m
ove du
p
licate '
-
-done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
Documentatio
n
: don't link
t
o exam
p
le m
a
il addr
e
sses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
Jo
h
n
Kee
p
ing
rebase -i con
t
inue:
don't skip
c
om
m
its t
h
at onl
y
change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree