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 'mk/combine-diff-context-horizon-fix' into maint
2013-05-17
John Keeping
difftoo
l
: fix dir-d
i
ff when file
do
e
s n
o
t exis
t
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John K
e
eping
me
r
ge-tree:
h
andl
e
di
r
ectory/em
p
t
y conf
l
ict co
r
r
ectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Joh
n
Keeping
contri
b
/
s
ubtree: don't
delete remote branc
h
es
i
f split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn
K
eepin
g
t
/
Makefile: remove smoke test
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tree:
fix typo in "
b
oth
c
hanged
i
dent
i
c
ally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n
K
ee
p
ing
transport-helper:
a
dd 's
i
g
n
e
d-ta
g
s'
c
apability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keep
i
ng
transport-helper: pass --signe
d
-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keepi
n
g
fast-export
:
add --sig
n
ed-ta
g
s
=
warn-strip mod
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
pin
g
t/test-lib
.
sh:
f
ix TRASH_D
I
RECTORY han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-
t
ree:
d
on't
p
rint entries that match "loc
a
l"
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): cla
r
ify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submo
d
ule: print g
r
a
p
h output next to su
b
module log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepi
n
g
diff: allow unstuck ar
g
ument
s
with --di
f
f-
a
lgorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
h
n Keeping
git-merge(1):
document diff-algorithm o
p
tion
to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
h
n K
e
ep
i
ng
bise
c
t: avoid signed in
t
eger ov
e
rflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n
K
eeping
d
i
f
fc
o
r
e
-break: don't divid
e
by z
e
ro
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run --dir-diff tests w
i
th and w
i
thout symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7800: fix test
s
w
h
en difft
o
ol uses
--
n
o-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7800: don'
t
hi
d
e g
r
e
p output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
difftool:
d
on
'
t overwr
i
t
e
modified
f
iles
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Kee
p
i
ng
t780
0
: move '--
s
ymlinks' spe
c
ific test to the
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tre
e
: fix typo in merg
e
-tree
.
c::unresolv
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Ke
e
p
ing
refs
.
c
: f
i
x fread
e
rror handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
entry: fi
x
filte
r
loo
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn K
e
eping
t2
0
03:
modernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
difftool --
d
ir-d
i
ff: syml
i
nk all fi
l
es matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
i
ff
t
ool: avoid double s
l
ashes in sym
l
ink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n Keepi
n
g
git-difftool(1): fix formatting of --symlink descripti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keep
i
ng
Revert "g
r
ap
h
.
c
:
mark pr
i
vate fil
e
-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makef
i
l
e
:
make mandir, html
d
ir an
d
i
nfodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
rebase -i: res
p
ect
c
or
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combin
e
-diff
.
c: t
e
ach com
b
ined dif
f
s
about li
n
e prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
d
i
ff
.
c: us
e
diff_line_prefix() where applicab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
diff: a
d
d diff_line_prefix
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Keeping
diff
.
c: ma
k
e con
s
tant
string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
diff: write prefix to the corr
e
ct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keep
i
ng
graph: output pa
d
ding f
o
r mer
g
e subsequent
p
arents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
Keeping
t4038:
a
dd tests
for "diff
--c
c
--raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: t
i
ghten (dis)similarity index p
a
rs
i
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keepi
n
g
merge
t
oo
l
--lib: list user configu
r
ed tools i
n
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
K
eeping
Rename {git- =>
git}r
e
mote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidelines: add Python coding guidel
i
nes
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-r
e
mote-
t
e
s
tpy: fix path h
a
shing on
P
ython 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keep
i
ng
mergetool--lib: don't call "
e
x
i
t" in setup_
t
o
ol
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keep
i
ng
git-difftool:
u
se git-merg
e
too
l
--li
b
for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
g
i
t
-m
e
rgetool: don't hardcode
'mergetool'
i
n show_too
l
_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n K
e
epin
g
git-mergetool: remove redundant assi
g
nment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
e
p
ing
gi
t
-merget
o
o
l: move
show_t
o
ol_help to
mer
g
eto
o
l--l
i
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-t
e
st
p
y
: call
p
rint
a
s
a f
u
nct
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Kee
p
i
n
g
git-remote-t
e
stpy: don't do unbuffered t
e
xt I/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
i
n
g
git-rem
o
te-testpy:
hash bytes exp
l
icitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe: allo
w
sv
n
rdump_s
i
m
.
py
to run
with P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remo
t
e_he
l
per
s
: u
s
e
2to3
if
building wi
t
h
Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git_remot
e
_helper
s
: f
o
rce rebu
i
ld if
p
ython version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keep
i
ng
g
it-cvs
i
mport
.
txt: c
v
sps-2
i
s deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-for-eac
h
-ref
.
t
xt
:
'raw'
i
s a supported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
o
hn Keeping
git_
r
emot
e
_
h
el
p
ers: fix input when run
n
ing
under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keepi
n
g
git_
r
emote_he
l
pers
:
allow building with
P
yt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John
K
eeping
git-svn:
t
each
find-rev t
o
find near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
Keeping
git-fast-i
m
port(1): reorganise
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
ping
git-fast-import(1): combine documentation of
--[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-shortlog(1)
:
document behav
i
our of zero-width
wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
J
o
h
n Keepi
n
g
git-fast-import(
1
): remove duplicate
'
--done'
o
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
K
eeping
Docu
m
entation: don't link to
e
x
ample mail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
reb
a
se -i continue
:
don't skip commits tha
t
onl
y
change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree