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
Merge branch 'js/config-set-in-non-repository'
2016-02-23
John Ke
e
ping
t920
0
: avoid grep on non-ASCII dat
a
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2016-02-23
J
ohn Keeping
t
8
005: avoid grep on non-A
S
CII
data
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2016-01-25
John Keep
i
ng
c
ompleti
o
n: add missing git-rebas
e
o
p
ti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-12-11
John
K
eepi
n
g
se
n
d-email: e
n
able SSL
l
e
v
el
1
debug output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-11-24
John Keeping
send-e
m
ai
l
:
die if CA path
doesn't e
x
ist
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-11-20
John
K
e
eping
sen
d
-email: expand path in s
e
ndemail
.
sm
t
psslcertpath
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-25
John Keeping
Docum
e
ntation: fix sectio
n
header mark-u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-11
John Keepi
n
g
Documen
t
ation/git-reb
a
se: fi
x
-
-
no-autostash
f
o
r
matting
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-11
John Keeping
rebase: support --no
-
au
t
o
stas
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-10
John Keeping
Makefile
:
fix MAKEFLAGS
tests with multiple fla
g
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
J
o
hn Kee
p
ing
i
nte
r
p
r
et-trailers: allow r
u
nning outs
i
de a repos
i
tory
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
Jo
h
n Kee
p
ing
te
s
t-lib-
f
unctio
n
s: detect test
_
w
h
en_fini
s
hed
i
n subshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keeping
t
7800: don't
use test_config in a
subshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keeping
test-lib-functions: support "test_config -C <dir>
.
.
.
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
J
o
h
n
Keeping
t5801: do
n
't u
s
e
test_
w
hen_f
i
n
ished in a sub
s
hell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
Jo
h
n Keepin
g
t7610: don't
u
s
e tes
t
_
c
onf
i
g in a subshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keepi
n
g
t6300: ad
d
t
e
sts for "-loca
l
"
date format
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keeping
t6
3
00: make UTC and
l
oca
l
dates different
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
Joh
n
Keeping
d
a
te: check
for "loca
l
" before an
y
t
h
ing else
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John K
e
ep
i
ng
t6300: ad
d
test for "raw" date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
J
o
hn Keeping
t6300: introduce
t
e
st_date() h
e
lp
e
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John K
e
e
ping
Documenta
t
ion/rev-list: don'
t
list date f
o
r
m
ats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
J
ohn Keepin
g
Docu
m
entation/gi
t
-fo
r
-e
a
c
h-ref: don't
list
d
a
te forma
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Ke
e
ping
D
ocum
e
ntation/con
f
ig: don't l
i
st d
a
t
e
formats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Ke
e
ping
Documenta
t
ion/blame-options: d
o
n't list date form
a
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-03-31
Joh
n
K
e
eping
streaming
.
c: fix a memleak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Jo
h
n Ke
e
pin
g
completion: comp
l
et
e
`git
push --force-
w
ith-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
completion: ad
d
s
ome missing options to `git pus
h
`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
comple
t
ion: c
o
mplete "unstuck"
`
git push --recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keepi
n
g
rebase: omit
p
atch-id
e
ntic
a
l commits with --
f
ork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
J
o
hn Keeping
rebase
-
-am: use
--cherry-pic
k
inste
a
d
of
--ig
n
ore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keep
i
ng
completi
o
n
:
a
dd missing optio
n
s for git-merg
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
oh
n
K
eeping
completi
o
n:
ad
d
a note th
a
t merge
options are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John
Keeping
builtin/mv: fix out of bounds
write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
builti
n
/mv: do
n
't
u
se me
m
o
r
y a
f
t
er fr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n
Ke
e
ping
utf8:
use c
o
rrect type
for v
a
l
u
es in
interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Keeping
utf8: fix
ico
n
v error
detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
notes-
u
tils:
h
a
ndle bool
e
an notes
.
rewrit
e
m
o
de cor
r
e
c
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Ke
e
pi
n
g
M
a
kefile:
r
emove redundant obj
e
ct in git-ht
t
p{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
o
hn Keepin
g
pull: suppress err
o
r when no remoteref
is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
ee
p
ing
compl
e
t
i
on: handle -
-
[no-
]
f
ork-point opt
i
o
n
s to g
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
Keepi
n
g
compl
e
tion: complete merge-base opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
r
eba
s
e: f
i
x
f
ork-
p
oint with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keepin
g
re
b
ase: use reflog to fi
n
d com
m
on base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keep
i
ng
pull:
u
se merg
e
-b
a
se --fo
r
k-point when
a
pprop
r
iat
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
e
pi
n
g
p
eek-remote: rem
o
ve depre
c
ated alias of
l
s-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keeping
lost-found: re
m
ove deprecated comman
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Kee
p
ing
tar-tree: remove depr
e
c
ated
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
repo-conf
i
g:
remove d
e
precated
a
lias
for "g
i
t co
n
f
i
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
Keeping
Documen
t
ation/Makefile: make
AsciiDoc dblatex dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
mer
g
e-recursive: fix parsing
of "diff-algor
i
t
h
m" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
K
eeping
reset: ha
n
dle submodul
e
with
t
railing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepin
g
rm
:
re-
u
se parse_pat
h
spec's
trailing
-
slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
Keeping
git_remote_helper
s
: remove
lit
t
le used Python librar
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn K
e
eping
r
e
v-
p
arse(1
)
:
l
o
g
ic
a
lly group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
p
i
ng
rev-p
a
rse: remove restrictions on some option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
p
ull: c
h
ange the
descriptio
n
to
"
integra
t
e
"
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
p
u
sh: avoi
d
suggesti
n
g
"
merging" remote
c
hang
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
ng
git-config(1): cla
r
i
f
y p
r
e
c
ed
e
nce o
f
multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Jo
h
n Keeping
git-con
f
ig: upd
a
t
e doc
for --get with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
Keepin
g
completion: l
e
arn about -
-
man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Ke
e
ping
completi
o
n: handle unstuck
form
o
f base
git option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-im
p
ort: allow mo
v
i
ng the root tre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
e
e
p
ing
fa
s
t-imp
o
rt:
allow l
s
o
r
fil
e
copy of
t
he ro
o
t
tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
fast-im
p
ort: set v
a
lid
mo
d
e
o
n root tr
e
e in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t
9300: document
f
ast
-
import e
m
p
t
y
path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
submodule: drop
t
he top-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
re
v
-parse:
a
d
d
--
p
refi
x
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: show full
p
a
t
h i
n
error
m
e
ssage
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
t
7
4
03:
m
odernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
t7401
:
make i
n
dentation consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
m
erget
o
ol--lib: refactor {diff,me
r
ge}_cm
d
l
ogic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
Documentation/Makefile: move info
d
ir
t
o
b
e
with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Kee
p
ing
Doc
u
menta
t
ion/Makefile:
fix
space
s
around a
s
s
ignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
eping
add-
-
i
nteractiv
e
: r
e
spect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gui: fix file
name handl
i
ng with no
n
-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keepin
g
fetch: d
o
n
't
try to updat
e
unfet
c
hed trac
k
ing refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftool: fix dir-diff when f
i
le d
o
es not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keep
i
ng
merge-tr
e
e: handle directory/empt
y
c
onflict c
o
rrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
J
o
hn Keeping
t/Makefil
e
: d
o
n'
t
d
efine
TES
T
_RES
U
L
T
S
_
DIR
E
C
T
ORY
r
ecursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Joh
n
Keepi
n
g
co
n
t
rib/
s
ubt
r
ee: do
n
't delete remote b
r
a
nches
i
f split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Joh
n
Keeping
t
e
st output: res
p
ect $TE
S
T_OUTPUT_DIR
E
CTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Ke
e
pi
n
g
t
/
M
a
kefi
l
e: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
e
ep
i
ng
mer
g
e-tree: fix
t
y
p
o in
"
bot
h
c
hanged
identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/
M
ak
e
file: fix result
h
a
nd
l
in
g
with TEST_OUTPU
T
_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
n
g
transport-hel
p
er: add
'signed-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
transpor
t
-h
e
lper:
p
ass --s
i
g
n
ed-ta
g
s=warn
-
strip
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
h
n Keeping
fast-expor
t
: a
d
d --
s
i
g
ned-tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
pi
n
g
t/test-lib
.
s
h
: fi
x
TRASH_DIREC
T
OR
Y
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n
K
e
ep
i
n
g
merge-tree: don't print ent
r
ies
t
h
a
t match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Jo
h
n
Kee
p
i
n
g
gitr
e
mote
-
helpers
(
1):
clarify refs
p
e
c behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
submodule: print
gr
a
ph
output next to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
diff: allow un
s
tuck arguments with --di
f
f-a
l
gorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge(1):
d
ocument
d
iff-
a
lg
o
rit
h
m option
t
o
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepin
g
bisect:
a
void signe
d
integer overflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-break:
don'
t
divide by ze
r
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Kee
p
ing
t
7800: ru
n
--dir-diff
t
est
s
w
i
th and witho
u
t
s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
p
i
ng
t7800: fix te
s
ts
whe
n
difftool uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
eping
t7800: don'
t
h
i
de grep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next