repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint-1.8.2' into maint
2013-05-17
John
Keeping
difftool: f
i
x dir-
d
if
f
when f
i
le does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n
K
e
ep
i
ng
m
e
rge-tree:
h
andle d
i
rectory/empty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keeping
t/Makefi
l
e: r
e
m
ove
smoke
test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tree: fix typ
o
in "b
o
th changed id
e
ntically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
transport
-
h
e
lper:
a
dd 'signed-tags'
capabil
i
ty
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tra
n
sport-helper: pass --s
i
g
ned-
t
ags=warn-s
t
r
i
p
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
fast-export: add -
-
sig
n
ed
-
ta
g
s=w
a
rn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/te
s
t-lib
.
s
h
:
fix TRASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eepin
g
m
er
g
e-tree: don't pri
n
t entries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
K
e
eping
gi
t
remo
t
e-helpers(1): cl
a
rif
y
refspec
b
ehaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
sub
m
od
u
le: pri
n
t graph output nex
t
to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keeping
d
i
f
f: allo
w
uns
t
uck a
r
gumen
t
s with -
-
diff-al
g
orithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keep
i
ng
git
-
merge(1): docume
n
t diff-alg
o
r
i
thm
o
ption to me
r
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect
:
avoid signed integer overf
l
ow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
oh
n
K
e
ep
i
ng
diffcore-break: don't d
i
vide
by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7800:
run --dir-dif
f
tests with a
n
d
without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800: fix
t
e
s
ts when difftool uses --no-symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keepin
g
t
7800
:
don
'
t hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keepi
n
g
difftool: don't overwrite modif
i
ed files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n
K
e
eping
t7
8
00: move '--symlinks'
specific t
e
st t
o
the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn Keepin
g
mer
g
e
-
t
r
ee: fi
x
typo
i
n merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keepin
g
refs
.
c:
f
ix fread
error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keepi
n
g
e
n
try:
f
ix filter looku
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
t
2003: mo
d
ernize st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
pi
n
g
diffto
o
l -
-
dir-diff: syml
i
nk all files
m
atching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
difftool: avoid do
u
ble slashes in symlink ta
r
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n Ke
e
pin
g
git
-
d
i
ffto
o
l(1):
f
ix fo
r
mattin
g
of --symlink descriptio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "grap
h
.
c: mark
pr
i
vate file-scop
e
symbols a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John K
e
eping
M
a
k
e
f
ile:
make mandi
r
, htmldir and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase
-
i: respect core
.
co
m
m
e
n
t
char
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Ke
e
ping
combine-diff
.
c: teach com
b
ined diff
s
about
line pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
di
f
f
.
c:
use
d
i
ff_line
_
prefix() where a
p
plicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keepin
g
diff: add dif
f
_line
_
p
r
efix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n K
e
e
ping
diff
.
c: mak
e
constant st
r
ing arg
u
m
en
t
s const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
di
f
f: writ
e
p
r
ef
i
x to the cor
r
ect f
i
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: output padding for merge subsequent
p
a
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add
t
ests fo
r
"
d
iff
-
-cc --raw <trees
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
Keeping
builtin/apply: tighte
n
(dis)similarity
i
ndex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Kee
p
ing
me
r
g
e
tool--lib: li
s
t
u
ser
c
onfi
g
ured tool
s
in '--too
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {
g
it- =
>
git}remote-
h
elpers
.
t
xt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Co
d
ingGuide
l
ines: add Py
t
hon co
d
in
g
guidelines
commit
|
commitdiff
|
tree
2013-01-28
J
o
h
n Keep
i
ng
git-remote-testpy:
fix path hashing on
P
y
tho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool-
-
lib: don't cal
l
"ex
i
t" in setu
p
_
t
o
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-difftool
:
use git-merget
o
ol--
l
i
b
for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Kee
p
ing
g
i
t-mergetool: don't hardcod
e
'mergetoo
l
' in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-
m
erge
t
ool: remove
r
edu
n
dant a
s
s
ignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-mergeto
o
l
:
m
ove sh
o
w_too
l
_help
to merg
e
tool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-remote-testpy: cal
l
p
r
int as a functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-r
e
mote-tes
t
py:
d
on't
d
o unbuffered text I/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
g
i
t
-
remote-testpy: hash
b
y
tes ex
p
licitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe: allow svnrdum
p
_si
m
.
py
t
o run
w
ith Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
ee
p
ing
git
_
remote_he
l
pers: u
s
e 2t
o
3 if building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it_
r
emot
e
_helpers: force
rebuild
if pyth
o
n version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-cvsimpor
t
.
t
xt: cvsps-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-for-each-re
f
.
tx
t
: 'ra
w
'
i
s a
s
u
p
po
r
ted da
t
e format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_
r
emote_h
e
l
p
ers
:
fix input
when running under Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n Keeping
git_r
e
mote
_
help
e
rs
:
allow building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
Jo
h
n Keeping
git-svn:
t
each f
i
nd-rev
to find near match
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
ping
git-fast-import(1): reorga
n
ise opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Kee
p
ing
git-fast-import(1): combi
n
e do
c
umentatio
n
o
f
--[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keep
i
ng
git-shortlog(1): document behaviour of
zero-
w
idth wra
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
Joh
n
Ke
e
p
i
n
g
git-fast-import
(
1
)
: re
m
ove duplicate
'
-
-
done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
J
o
h
n
Keepin
g
Documentation:
d
on't li
n
k to example mai
l
addre
s
ses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
re
b
ase
-i c
o
ntinue: don't
skip co
m
mits
t
h
a
t on
l
y ch
a
nge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree