repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/pending-keep-tag-name' into maint
2015-12-11
John Keeping
se
n
d
-
e
m
ail: enable SSL l
e
ve
l
1 debug outp
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-25
John
Keeping
Documenta
t
ion: fix se
c
tion header ma
r
k-u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-11
John Keeping
Documentation/
g
i
t
-
rebase:
fix --no-autostash
f
ormatti
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-11
John Keeping
rebase: support --no-autostas
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-10
John K
e
eping
Makefile: fix MAKEFLA
G
S tests with multiple flag
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keeping
interpret-trai
l
ers: a
l
low ru
n
ning o
u
tside a repositor
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keeping
t
e
st-lib-func
t
ions: dete
c
t test_when_fini
s
hed in subshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John
K
eeping
t7800: don't use test_con
f
i
g in a
s
u
bshe
l
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Kee
p
ing
test-lib-
f
unctio
n
s: support "te
s
t_config -C <dir>
.
.
.
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
Jo
h
n
Keeping
t5801: don
'
t use test_when_
f
inished i
n
a subshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keepin
g
t7610: don't
u
se test_config in
a su
b
shell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-03-31
John
Keeping
streaming
.
c
:
fix a m
e
mleak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Kee
p
ing
completio
n
: co
m
plete `git
p
ush -
-
force-
w
ith-le
a
s
e
=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
ohn Keeping
c
o
mpleti
o
n: add some missin
g
options to `g
i
t push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John
Kee
p
in
g
co
m
p
l
e
tion: co
m
ple
t
e "
u
nstu
c
k
"
`gi
t
push -
-
recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
J
o
hn
K
eep
i
ng
re
b
ase: omit patch-identical commits with --fork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
Jo
h
n
Keeping
rebase--am: use --cherry
-
p
i
ck i
n
stead of -
-
ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keepi
n
g
completion: add missing op
t
ion
s
for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John
Keepi
n
g
completi
o
n: add a note that merge op
t
i
o
n
s
a
r
e shar
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Ke
e
pi
n
g
builtin/
m
v: fi
x
o
u
t of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Kee
p
in
g
builtin/m
v
: don't
use memory after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keepin
g
ut
f
8: use
correct typ
e
for value
s
in inter
v
al ta
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: fix
iconv error detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
notes-utils: handle boo
l
ean notes
.
rewritemode correctl
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Ke
e
pi
n
g
Makefile: remove
r
edund
a
nt object in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
Joh
n
Keeping
pull: sup
p
ress error when
n
o
r
emote
r
ef i
s
fo
u
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keep
i
ng
c
o
mpletion: ha
n
dle --[
n
o-]fork-point options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keepin
g
completion: comp
l
ete
m
er
g
e-
b
a
s
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Kee
p
ing
r
e
bas
e
: fix fork-point w
i
th zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
Joh
n
Keeping
rebase: use
r
eflog
t
o
fin
d
c
ommon base
w
ith upst
r
eam
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Joh
n
Keeping
pu
l
l:
use
merge-
b
ase --fork-poin
t
whe
n
approp
r
ia
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
pe
e
k-r
e
mo
t
e: remove deprecated alias of ls
-
re
m
ot
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost
-
found: re
m
ove de
p
reca
t
ed c
o
mmand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n Keeping
tar
-
tree: remo
v
e dep
r
ecat
e
d
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n
Keep
i
n
g
r
e
po-config: remo
v
e deprecated alias for "git
config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keep
i
ng
Documentatio
n
/Makefile:
ma
k
e AsciiDoc d
b
l
a
tex dir configur
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
Jo
h
n
Keeping
merge-recursive: fix
p
ars
i
ng of "diff-algo
r
ithm"
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
K
ee
p
ing
r
eset
:
han
d
le submo
d
ule with trailing
s
lash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Kee
p
ing
rm: re-use parse_
p
athspec's traili
n
g
-slas
h
remov
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Kee
p
ing
git_remot
e
_helpers:
r
emove littl
e
used Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Kee
p
ing
rev-parse(1): l
o
gicall
y
group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn K
e
eping
rev-
p
a
rs
e
: remo
v
e
restrictions on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
o
hn
Keep
i
ng
pull: change
the
des
c
ripti
o
n
to "integrate"
c
hang
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keepi
n
g
pus
h
: avoid suggesting "merging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keepi
n
g
g
it-c
o
nfig(1
)
: clarif
y
precedence of mu
l
tipl
e
v
al
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John
K
eeping
git-confi
g
: update doc for --get with
multiple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keeping
completi
o
n
:
l
earn abou
t
-
-
man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John K
e
eping
completio
n
: han
d
le unstuck fo
r
m
o
f
base g
i
t opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn K
e
eping
fast-import: allow
m
ovin
g
the
root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
f
a
s
t-import: al
l
ow
ls or fileco
p
y of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
f
a
st-impo
r
t
: set valid mod
e
on roo
t
tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepi
n
g
t9300:
d
ocum
e
nt fast-import empty
p
ath issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keepi
n
g
submodul
e
: drop the t
o
p-lev
e
l requir
e
ment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-pa
r
se: ad
d
--
p
re
f
i
x
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
i
n
g
su
b
modu
l
e: show
full pa
t
h in err
o
r
m
es
s
a
ge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
t
74
0
3
:
ad
d
m
i
ssing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
t7403: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Ke
e
ping
t7401: make indentat
i
on c
o
n
sistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool--lib: refactor {diff
,
mer
g
e}
_
cmd logi
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
Documentation/Ma
k
efi
l
e: mov
e
in
f
odir to be wi
t
h other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
K
e
e
pi
n
g
Documentati
o
n/Makefile:
f
ix spaces
a
r
ound a
s
s
i
gn
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
ep
i
n
g
a
d
d--interactive: respect diff
.
alg
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
ohn
K
e
e
ping
git-gui: fix file name handl
i
ng with no
n
-
e
mpty pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
ohn Kee
p
in
g
fetch: do
n
't try to update un
f
et
c
hed
tracki
n
g re
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Jo
h
n Keepi
n
g
diff
t
ool: fix dir-dif
f
when
f
ile d
o
es not
e
xist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
o
hn Keeping
merge-t
r
ee: handle
d
ire
c
t
o
ry/empty
conflict
corr
e
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keepi
n
g
t/Makefile: don't define TEST_R
E
SULTS_
D
IRECTOR
Y
recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keepin
g
cont
r
ib
/
subtree: don
'
t
delete remote
branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
K
eeping
test
o
utput
:
respect $TE
S
T_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keep
i
ng
t
/
Mak
e
file
:
remove smoke
t
est targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepi
n
g
merge-
t
ree: fix typo
i
n "bo
t
h changed identically
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John
K
eeping
t
/
Makefile: fi
x
r
esult h
a
ndling wi
t
h
T
EST_OU
T
PUT_D
I
RECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
r
ansport-he
l
pe
r
: add 'signed-tags'
cap
a
bility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
trans
p
o
rt-helper: pass --
s
ig
n
ed-tags=warn-st
r
ip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
e
e
ping
fast-export: add --sign
e
d-tag
s
=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/test-lib
.
sh: f
i
x TRASH_DIREC
T
ORY handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Joh
n
Keeping
merge-tree: don't p
r
int e
n
tri
e
s that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keep
i
n
g
g
itr
e
mote-he
l
pers(1): clarify ref
s
p
e
c behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodul
e
:
p
rin
t
graph outpu
t
next to submodu
l
e log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keeping
diff
:
allow u
n
s
tuc
k
arg
u
ments
with --diff-alg
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keepin
g
git
-
merge(1): docume
n
t diff-algorithm o
p
t
i
o
n
to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bis
e
c
t: avoi
d
sign
e
d integ
e
r
overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn Keeping
diffcore-
b
rea
k
:
don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run
-
-dir-diff tests with and without symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t78
0
0: fix
t
ests
w
he
n
di
f
fto
o
l u
s
es --no-s
y
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t7
8
0
0
: don't hi
d
e grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
d
i
fftool: don't
o
v
erwrite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '--symlinks' sp
e
cifi
c
tes
t
to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John K
e
epin
g
m
e
rge-tree: fix typo in merge-
t
r
e
e
.
c::unresol
v
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
ohn
Keeping
refs
.
c:
f
ix fread er
r
or handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
e
ntry:
fix filter looku
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
t20
0
3: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool --d
i
r-di
f
f: symlink all fil
e
s matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
d
ifftool: avoid double slashes in
s
ymlink
t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
e
p
i
ng
git-
d
ifft
o
o
l(1): fix
f
orm
a
tting
of --s
y
mlin
k
d
e
scripti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
o
h
n
Keep
i
n
g
Revert "graph
.
c: mark priv
a
te file-scop
e
s
ymbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile: make ma
n
dir, htmldir and
info
d
ir abso
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
rebase -i: respect core
.
c
o
mmentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Ke
e
pi
n
g
combi
n
e
-
d
if
f
.
c: te
a
ch
c
o
mbined
d
iffs about
l
ine pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
diff
.
c: use diff
_
line_pref
i
x() where
a
pp
l
ica
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next