repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t5551: Remove header from curl cookie file
2013-07-08
John Keeping
pu
l
l
:
c
h
ange
the
descr
i
ption
t
o
"integrate" chan
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
ohn Keeping
p
ush: avoid suggesting "
m
ergi
n
g
" remo
t
e changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn Keeping
git-co
n
fi
g
(
1
)
: clarify p
r
ec
e
dence of mu
l
tiple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Kee
p
ing
git-config: update doc for --g
e
t with multip
l
e
value
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
c
o
mp
l
e
t
i
o
n:
learn about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keepi
n
g
c
om
p
l
e
t
i
on:
handle unst
u
ck form of base
g
it
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: drop t
h
e
t
op-le
v
el requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
rev-
p
ar
s
e: add --
p
refix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule:
show fu
l
l path in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7
4
0
3: add missin
g
&& cha
i
n
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
t
7401: make inde
n
t
a
tion
c
o
n
sistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
m
e
r
g
etool-
-
lib: refactor
{d
i
f
f
,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
D
o
cument
a
tion/
M
akefil
e
: move info
d
ir to be
w
ith other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
Do
c
umentatio
n
/M
a
ke
f
ile: f
i
x s
p
a
ces
around assign
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keepin
g
a
d
d--interactive: respect diff
.
al
g
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Kee
p
ing
git
-
gui: fix file name handlin
g
wit
h
non
-
empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch:
d
on't
try to update
u
nfetched tracki
n
g ref
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
ohn Keeping
difftool:
f
ix
d
ir-diff when file does
not e
x
ist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
mer
g
e-t
r
ee: handle
directo
r
y/empty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keepin
g
t/Makefi
l
e:
don't
d
ef
i
ne TEST_RESULTS_DIRECTO
R
Y recursiv
e
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keepi
n
g
contrib/subtree: don't delete remote branches
i
f split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test
output: respect
$
T
E
S
T
_O
U
TPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn
K
eepi
n
g
t/Make
f
ile: re
m
ove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keep
i
n
g
m
erge-tree: f
i
x typo in
"
b
o
th
change
d
ide
n
tica
l
ly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John K
e
e
ping
t/Ma
k
e
f
ile:
f
ix
res
u
lt handling with T
E
ST_OUTPU
T
_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
transport-helper
:
ad
d
'
signed-tag
s
' ca
p
ability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transp
o
rt-helper: pass --signed-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
o
rt: add
-
-signed-tag
s
=w
a
rn-strip
m
ode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
t
/test-li
b
.
sh: fix TRASH_DIRE
C
TO
R
Y handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eep
i
n
g
merge-tree: d
o
n't p
r
int entries that match "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Kee
p
in
g
gitr
e
mote-helpers(1): cl
a
rify
r
efspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
in
g
su
b
module
:
print graph outpu
t
next to submodule
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
ng
diff: a
l
low
u
nstuck argu
m
ents with --di
f
f-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n K
e
eping
g
i
t-merge(1): documen
t
d
i
ff-a
l
gorithm option to
m
erge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n Kee
p
ing
bisect
:
avoid
s
igned
i
ntege
r
o
ve
r
f
low
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-break
:
d
on't di
v
ide by z
e
ro
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800:
run --dir-diff tests wi
t
h an
d
without symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: fix tests when difftool uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t
7
8
0
0: don't hid
e
grep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
difftoo
l
:
d
on't
o
v
e
r
w
rite mo
d
ified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t7800: move '--syml
i
nks' specific
t
est t
o
t
he end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
oh
n
Keeping
mer
g
e-t
r
ee
:
fix typo in merge-tree
.
c
:
:u
n
resolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Ke
e
ping
refs
.
c: fix
f
r
ead error handl
i
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
Ke
e
p
ing
entry:
f
ix filt
e
r lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Kee
p
ing
t2003: moder
n
ize sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
diff
t
o
o
l
-
-dir-diff: symlink all files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftoo
l
: avoid double
slashe
s
in symlink targ
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
git-diff
t
ool(1): fix formatting
of --symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Ke
e
ping
Revert "graph
.
c: mark pri
v
ate f
i
le-scope symbo
l
s a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
K
eepi
n
g
M
a
k
efile: mak
e
mandir, htmldir and
i
n
f
odir abs
o
lute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
rebas
e
-
i: respect core
.
c
o
mmentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-
d
if
f
.
c: teach combined diffs abou
t
line pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff
.
c: use diff_l
i
ne_prefix
(
) w
h
e
r
e a
p
plica
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Keepin
g
diff: add diff_
l
ine_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
diff
.
c: mak
e
constant st
r
i
n
g arg
u
men
t
s const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
diff: write p
r
efix to the c
o
r
rect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John
K
eep
i
ng
graph: outp
u
t p
a
dding for
m
erge subseq
u
ent p
a
ren
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Ke
e
ping
t4038: ad
d
tests for "dif
f
--cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/a
p
ply: tight
e
n
(
dis)simila
r
ity i
n
dex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool--
l
ib
:
list user
c
onfigured tools in
'
--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Ke
e
ping
Rename {git- => git}
r
emo
t
e
-
helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidelines
:
add Python co
d
ing guidelin
e
s
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remo
t
e-te
s
tp
y
: f
i
x p
a
th
h
ashi
n
g on P
y
tho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Keeping
m
er
g
e
t
o
o
l--lib: don't c
a
l
l
"exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
p
i
ng
git-difftool
:
use git-mergetool--lib for
"--tool-h
e
lp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-mergetool: d
o
n't
hard
c
ode
'mergetoo
l
' i
n
sho
w
_tool_he
l
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-mergetool: rem
o
ve redundan
t
assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keepi
n
g
g
it-mergetoo
l
: mov
e
s
h
ow_to
o
l_help to me
r
getool--li
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote
-
testpy: call print as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
r
emot
e
-
testpy: don't do unbuff
e
red text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-te
s
tpy: hash
b
ytes
e
xpl
i
citly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-
f
e: al
l
ow svnrdump_sim
.
p
y
t
o run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_helpers: use
2
to3 if building with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_helpers: force re
b
uild if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-cvsimport
.
txt:
c
v
s
ps-2
is de
p
recated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keep
i
n
g
git-fo
r
-e
a
c
h
-re
f
.
t
xt: '
r
aw'
is a sup
p
o
rted d
a
te
form
a
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
K
e
e
p
i
ng
git_remote_helpers: fix input
w
hen running
u
nder P
y
tho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
gi
t
_
remo
t
e
_
he
l
pers:
a
llow bui
l
ding with Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-s
v
n: teach find-rev
t
o find near ma
t
ches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n
Keeping
git-fas
t
-import(1): re
o
rga
n
ise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
Keeping
git-fas
t
-import(1):
c
ombine documenta
t
ion of -
-
[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
it
-
sho
r
tlog(1): doc
u
me
n
t beh
a
viour of zero-width
w
rap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
J
ohn Ke
e
ping
git-fast-
i
m
p
o
rt(1):
re
m
ove duplicate '--done' opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
J
ohn Kee
p
in
g
Documentation: don't link to example mail addr
e
s
s
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
J
ohn Keeping
r
ebase -i continue: don'
t
skip commit
s
that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree