repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/prune-all'
2013-05-17
John Kee
p
ing
dif
f
t
o
ol
:
fix dir-diff when fi
l
e does not exist
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Kee
p
ing
merge-tree: handle director
y
/empty c
o
nfl
i
c
t
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: remove
smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
merge-tree: fix
t
y
p
o in "
b
oth ch
a
nged identically
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Kee
p
i
n
g
transport-helper: add 'sign
e
d
-
t
a
gs' capabil
i
t
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keepin
g
tr
a
nsport-helpe
r
: p
a
s
s
--
s
igned-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-e
x
p
or
t
: add -
-
si
g
ned-tags=warn
-
strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/
t
est-lib
.
sh: fi
x
TRASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
o
h
n Keeping
m
e
rge-tree:
d
o
n
't
print entries
th
a
t
m
a
tch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
ohn
Keeping
git
r
emote-
h
e
lpers(1): clarify refs
p
ec be
h
a
v
iour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keeping
submod
u
le: print g
r
aph
output next
t
o submodule
l
og
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
diff: allow unstu
c
k ar
g
u
men
t
s with
--diff-algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
ng
git-merge(1): d
o
cument di
f
f-algorithm option t
o
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect:
a
v
oid sig
n
ed in
t
eger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
d
if
f
core-break: don't divide by
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run --dir-diff te
s
ts w
i
t
h
and
w
ithout symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn K
e
eping
t
78
0
0: fix tests
wh
e
n
di
f
fto
o
l uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: don't hide grep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
difftool
:
don't overwrite modified file
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '--symlin
k
s' specific test t
o
the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge
-
tree
:
fix typo in merg
e
-
t
ree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John
K
eep
i
ng
re
f
s
.
c
:
f
ix fr
e
ad error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix filter lo
o
kup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
t2003: mode
r
nize
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
difftool -
-
di
r
-diff: symlin
k
a
l
l files
matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
n
g
difftool: avoid
double slash
e
s
in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
git-difftool(1): fix formatting of --sym
l
ink
d
escript
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Rever
t
"graph
.
c: mark pr
i
vate f
i
le-
s
cope
symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Mak
e
file
:
ma
k
e mandi
r
,
h
t
mldir and infodir a
b
solute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
rebase -i: respect core
.
com
m
entchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-diff
.
c: teach combi
n
ed di
f
f
s
about line pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keeping
diff
.
c: use d
i
ff_line_p
r
efix() w
h
ere applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Ke
e
pin
g
d
i
ff
:
add diff
_
l
ine_prefix functio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
ee
p
i
ng
diff
.
c:
make
con
s
tant stri
n
g arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Ke
e
ping
diff
:
write prefix
to the c
o
rrect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: o
u
tput padding for merge
subse
q
uen
t
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
Joh
n
Keeping
t4038: a
d
d te
s
ts fo
r
"diff --cc --
r
aw <tr
e
es>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Kee
p
ing
buil
t
in/apply: tigh
t
e
n
(dis)similari
t
y index pa
r
sing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n K
e
e
p
ing
merge
t
ool--lib: list user configure
d
tools i
n
'--to
o
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git-
=> git}rem
o
te-hel
p
e
rs
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Ke
e
ping
Cod
i
ngGuide
l
in
e
s: add Python
coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keepi
n
g
git-remo
t
e
-
testpy: f
i
x path hashing
o
n
P
yt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
merge
t
ool--li
b
: do
n
'
t call "exit" in
s
e
tup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Kee
p
i
n
g
git-di
f
ftool:
u
s
e g
i
t-merget
o
o
l--l
i
b for "--tool
-
help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Kee
p
ing
git-mergetool: don't ha
r
d
code
'
mergetool'
in show_tool_hel
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
getool:
remove redundant assi
g
nm
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t
-merg
e
to
o
l
: move show_to
o
l_help to merge
t
ool--
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-rem
o
te
-
testpy: call print as a funct
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-rem
o
t
e-test
p
y:
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
git-re
m
ote-testpy: hash byt
e
s
exp
l
icitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keep
i
ng
svn-fe:
allow svnrdu
m
p_sim
.
p
y
to run
wi
t
h P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_helpers: use 2to3 i
f
building with Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Kee
p
ing
g
it_remote_helpers:
f
orce
rebuild
i
f pytho
n
version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
g
i
t-cvsimport
.
txt: cv
s
ps-2
is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Kee
p
i
n
g
git
-
for-each-
r
e
f
.
txt: 'raw' is
a supported date f
o
rmat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Keeping
git_r
e
mote
_
h
e
lp
e
rs: fix input when
r
unning under P
y
t
h
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_rem
o
t
e_helpers: allow bu
i
lding with Pyt
h
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
J
o
hn Ke
e
ping
git-svn: teach find-rev to find near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
it
-
fas
t
-import(1):
r
e
organise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
K
eeping
gi
t
-f
a
st-import(1): co
m
bine
doc
u
mentation of -
-
[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
h
n
Keep
i
ng
git-shortlog(1): d
o
cument behaviour of zero-wi
d
th wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fast-import(1): remove dup
l
ic
a
te '--done'
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keepin
g
D
ocumentation:
d
o
n't link to example
m
ail addre
s
ses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
Joh
n
Keeping
re
b
ase -i c
o
ntinue: don't skip c
o
mmits
that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree