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
guard against new pathspec magic in pathspec matching code
2013-07-08
Joh
n
K
e
eping
pull
:
change the description to "in
t
egrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
ng
p
ush: avoid suggesting "
m
erging" remote cha
n
ge
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
h
n
K
eeping
git-config(1): clarify
p
receden
c
e of multi
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John
K
eepi
n
g
git-config:
u
pdate
d
oc for --get
with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Ke
e
ping
comple
t
ion
:
learn about --man-
p
ath
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keeping
completion: ha
n
d
l
e unstuck
f
o
rm of b
a
se
gi
t
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
sub
m
odu
l
e: drop the to
p
-
level requ
i
rement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
e
p
ing
r
ev-
p
a
rse: add
--p
r
e
f
i
x
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule
:
show full path in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add missing &&
chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403:
modern
i
ze style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
t7401: make indentation consis
t
e
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
m
e
rg
e
tool--
l
ib: refactor {diff,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
Documentation/Mak
e
file
:
move infodir t
o
be w
i
th other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Docu
m
entation/Makefile:
f
ix
spa
c
e
s a
r
ound assignm
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--interactive: re
s
pec
t
d
iff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John
Keeping
git-gui: fix fil
e
name hand
l
ing with n
o
n-empty
p
r
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keepin
g
fetc
h
: don't try to update unfetched t
r
acking r
e
fs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keepin
g
difftool
:
fix
dir-di
f
f when file does not exi
s
t
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-
t
ree: handle directory/
e
mpty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
Jo
h
n Kee
p
ing
t/Ma
k
efile: don
'
t define TEST_RESULT
S
_DIRECTORY
recu
r
sively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Kee
p
ing
contri
b
/subtree: don't
delet
e
remote b
r
anches if
s
plit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output: respect $TES
T
_OUT
P
U
T
_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepi
n
g
t/Makefile: remov
e
smoke test targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Kee
p
ing
me
r
ge
-
tree: f
i
x typo in "both changed identical
l
y"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile: fix result handling with TEST_OUTPUT_D
I
REC
T
ORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
transpo
r
t-helper:
add 'signed-tags' c
a
pa
b
ility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
trans
p
or
t
-helper: p
a
ss --si
g
ned-tag
s
=w
a
rn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
oh
n
Keeping
fast-expor
t
: add
-
-signed-tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
t/t
e
st-li
b
.
sh: fix
TRASH
_
D
I
RE
C
TORY h
a
n
d
l
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-t
r
ee: d
o
n
'
t prin
t
entries t
h
at match "local
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Joh
n
Ke
e
p
ing
g
i
tre
m
ote-helpers(1): cla
r
ify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keepin
g
submodule: print
graph
o
u
t
p
ut
next to
s
ubmodu
l
e log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
eping
diff: all
o
w
unstu
c
k argu
m
ents
w
i
th
-
-diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
git-merge
(
1
): docume
n
t diff-algorithm op
t
i
o
n to mer
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bi
s
ec
t
: avoid
signed integer o
v
e
r
flow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-bre
a
k: don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keep
i
ng
t7800: run --
d
ir-diff tests w
i
th and
w
i
th
o
u
t
sy
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: fix tests when
difftool us
e
s --no-
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t7800: don't hide
g
rep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keep
i
ng
difftool: don't over
w
rite modified f
i
les
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: mov
e
'--sym
l
inks' specific test
to
t
he end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
K
eeping
m
erge-tre
e
: fi
x
typo
in merge
-
t
ree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fi
x
fread error
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
entry: fix
f
il
t
er loo
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn
K
eeping
t2003
:
mode
r
nize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
difftool --dir-diff: symlink all files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keepin
g
difftool: avoid dou
b
le slashes
i
n s
y
mlin
k
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool
(
1): f
i
x formatting of -
-
symlink desc
r
ip
t
io
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c: ma
r
k pr
i
v
a
te
file-scope s
y
mbo
l
s as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile: make m
a
n
d
ir,
h
t
m
l
d
i
r and infodir
absolut
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
rebas
e
-i
:
re
s
pect core
.
c
o
mm
e
n
t
char
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
combine-dif
f
.
c: teach co
m
b
ined d
i
f
fs
about line
p
refix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
diff
.
c
: use diff_li
n
e
_
prefix() wher
e
ap
p
lica
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keep
i
ng
di
f
f: add
d
iff_l
i
n
e_prefix fu
n
ct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c
:
make
co
n
st
a
n
t
string
argu
m
en
t
s const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keep
i
ng
diff: write pr
e
f
ix to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Kee
p
in
g
graph: output paddin
g
for merge subse
q
uent parent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn Keepi
n
g
t
4038: ad
d
tests for "di
f
f --cc --raw <tre
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Keeping
builtin/apply: tighten (dis)simil
a
r
i
ty i
n
dex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
mergetoo
l
--lib
:
list
u
s
e
r configured tools in '-
-
tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn Kee
p
in
g
Re
n
am
e
{git- => git}re
m
ote
-
helpers
.
t
xt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
C
o
d
i
ngGuidelines: add Python co
d
ing guidel
i
nes
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn Keeping
git-remot
e
-testpy: fix pa
t
h hashing o
n
P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
ng
mergetool--lib: don't
c
all "exit" in setup_too
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
g
i
t-difftool:
use git-mergetool--li
b
for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
getool
:
don
'
t hard
c
o
d
e
'
m
er
g
etool' in show
_
tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merge
t
ool
:
remove redundan
t
assi
g
n
m
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
ping
git-mergetool: move
s
h
ow
_
to
o
l
_help to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-remote-testpy: call print as
a
funct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-remote-
t
estpy: don
'
t do unbuffered
text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-re
m
ote-testpy: ha
s
h b
y
tes ex
p
licitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
svn-fe: al
l
ow svnrdump_s
i
m
.
py to
run wit
h
Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_helpers: us
e
2to3 if
b
uil
d
ing with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git_remote_helpers: force r
e
build if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git
-
cvs
i
mport
.
t
x
t: cvs
p
s-2
i
s deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Jo
h
n
K
e
eping
git-for
-
ea
c
h-ref
.
t
x
t
:
'r
a
w
' is a supported da
t
e
format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Kee
p
i
ng
g
it_remot
e
_he
l
pe
r
s:
f
i
x input
w
hen run
n
in
g
under
Pyth
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Joh
n
Keeping
gi
t
_remote_helpe
r
s:
a
llow b
u
ilding wi
t
h Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
J
o
hn Keeping
g
i
t
-svn: tea
c
h f
i
n
d-rev to
find near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn Keepi
n
g
g
i
t-
f
ast-i
m
p
o
rt(
1
): reo
r
ganise opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
i
t-fast-import(1
)
: combine do
c
umentation of --[
n
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepin
g
git-
s
hor
t
log(1): document
b
ehaviour
of ze
r
o-w
i
dth wr
a
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fas
t
-im
p
ort(1): re
m
ove dupli
c
ate '--done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
Joh
n
Keeping
Do
c
umentation: don't link to exam
p
l
e
mail a
d
d
r
esses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
rebase -i cont
i
nue: d
o
n'
t
sk
i
p commits th
a
t o
n
ly c
h
ange
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree