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 'fc/remote-hg' (early part)
2013-05-07
John
K
e
eping
merge-tree: handle di
r
ectory/emp
t
y confl
i
ct
co
r
rectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
e
ping
t/Mak
e
file: remove s
m
oke test tar
g
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
e
eping
merge-tree: f
i
x
t
y
po in "both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-hel
p
er
:
add 'sig
n
ed
-
tags' cap
a
bility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Kee
p
ing
transport-helper: pass --signed-tags=warn-strip
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-ex
p
ort: add --signed-tags=warn-st
r
ip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test
-
l
ib
.
s
h: fix TRAS
H
_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keepi
n
g
merge-tree:
don't print entries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
ohn K
e
e
ping
gitremote-helpe
r
s(1): clarify r
e
fspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn K
e
eping
s
ubmodule
:
pr
i
nt graph out
p
u
t next to submo
d
u
le
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keepi
n
g
diff: a
l
l
o
w uns
t
uck arguments with -
-
diff-alg
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
git-merge(1): document diff-algo
r
ithm option
to
m
erg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid signed in
t
eger overflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eeping
diffcore-br
e
ak:
d
on't di
v
id
e
by z
e
ro
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7800: run --dir-diff t
e
sts with and without
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Ke
e
p
ing
t7800: fix t
e
s
ts
whe
n
diff
t
o
ol uses --no-syml
i
nks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
n
g
t7800: don't hide grep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
difftool: don't ov
e
rwrite mod
i
fied
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Kee
p
ing
t7800: move '--sy
m
links' spe
c
ific
test to
t
he end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Ke
e
ping
merge-tree: fi
x
ty
p
o in mer
g
e-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keep
i
ng
re
f
s
.
c: fix frea
d
e
rror ha
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entr
y
:
f
ix filt
e
r l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
t2003
:
modernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
ep
i
ng
difftool
--dir-diff: s
y
ml
i
n
k all
f
iles
m
atch
i
ng t
h
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
d
i
ff
t
ool: a
v
oid double slashes
i
n symlink target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Kee
p
i
n
g
git-difftool(1)
:
fix formatt
i
ng of --symlin
k
desc
r
iption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Re
v
ert "graph
.
c: m
a
rk private file-sco
p
e sy
m
bols a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Ke
e
p
ing
Makef
i
le: m
a
k
e
mand
i
r, h
t
ml
d
i
r and inf
o
di
r
abso
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: re
s
p
e
c
t
core
.
commentc
h
ar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
comb
i
ne-diff
.
c
:
teach
c
om
b
ined dif
f
s
ab
o
ut lin
e
pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: use
diff_
l
ine_prefix() w
h
ere appl
i
c
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff: add diff
_
line_
p
r
e
f
i
x
functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff
.
c: mak
e
constant st
r
ing arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff:
w
rite pre
f
ix
t
o
t
h
e correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Jo
h
n
K
eeping
graph: outp
u
t paddin
g
f
o
r merge subsequent
parent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Ke
e
ping
t4038
:
add tests for "diff -
-
cc --
r
a
w
<trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
K
e
epi
n
g
builtin/ap
p
ly: tighten (
d
is)similarity
i
nd
e
x par
s
i
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
ergetool--l
i
b: list user conf
i
gured tools
in '-
-
tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn Keeping
R
ename {git- => git}rem
o
te-h
e
l
pers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
h
n Keeping
C
od
i
ngGuidelines:
a
dd
P
ython coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
g
i
t
-
remote-testpy: fix path
h
ashing
on Pyth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
mergetool--l
i
b: d
o
n't call "exit
"
in setup_too
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keep
i
n
g
git-difftool: use
g
it-merget
o
ol--
l
ib for "--t
o
ol-hel
p
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
ep
i
ng
git-mergetool: do
n
'
t
hardcod
e
'mergetool'
in s
h
ow_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-
m
ergetool: remove
r
e
dundant as
s
ignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n K
e
e
p
ing
g
i
t-mergetool:
move sho
w
_too
l
_he
l
p to mergeto
o
l--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
eeping
git-remote
-
testpy:
c
al
l
print as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-remote
-
te
s
tpy: don't
do unbuffered
text
I
/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-r
e
mo
t
e-testpy
:
hash bytes exp
l
i
cit
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
s
v
n-f
e
:
allow svnrdum
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
g
it_remote
_
helpe
r
s: us
e
2
t
o3 if buildi
n
g with
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
n
g
git_remote_h
e
l
p
ers: force rebuild if pyth
o
n
v
er
s
ion
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
g
i
t-c
v
simport
.
txt:
cvsps-2 is d
e
precated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keepi
n
g
git-for-each-ref
.
txt: 'raw' is
a
suppor
t
ed
da
t
e
for
m
at
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Joh
n
Keeping
gi
t
_rem
o
te_helpers: f
i
x input when run
n
ing
u
nder Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keep
i
ng
git_remote_helpers: allow
b
uilding with
P
ython 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John
Keepi
n
g
git-sv
n
: teach find-r
e
v
to fi
n
d near mat
c
hes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
K
eeping
gi
t
-fast
-
import(1):
reorganise option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-import(1): combine documentation
o
f
--
[
no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-s
h
o
r
t
log
(
1): do
c
ument beh
a
viour of
z
ero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keepin
g
git-
f
as
t
-
imp
o
rt(1): remove duplicate '--
d
one' optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John K
e
eping
Documentation
:
don't link to
exa
m
ple mail ad
d
r
esses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
rebase -i
c
ontinue
:
d
o
n't s
k
ip commits that
o
nly change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree