repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sb/plug-streaming-leak'
2015-03-31
John Keeping
streaming
.
c
:
fi
x
a me
m
l
e
ak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
co
m
pletion
:
complete
`git push
-
-fo
r
ce-wi
t
h-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John K
e
epi
n
g
completion: ad
d
some missing opt
i
ons
t
o `g
i
t push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
completi
o
n: complet
e
"unstuck" `g
i
t p
u
sh --recu
r
se
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
J
o
hn Keeping
rebase: omit patch-identi
c
al commits with --fork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John
K
eeping
rebase--am
:
use --cherry-pic
k
i
nstead of -
-
ig
n
or
e
-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
completio
n
: add missing options for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
com
p
letion: add a no
t
e
t
hat merge
opti
o
ns are s
h
ared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
Jo
h
n Ke
e
ping
built
i
n/mv
:
fix out
o
f bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Keepin
g
builtin/mv: don't use memory after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keeping
utf8: use correct ty
p
e
for val
u
es in
interval t
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: f
i
x iconv error detect
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Keeping
notes-
u
t
ils: handle boolean notes
.
rewr
i
temode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefile: remo
v
e
r
e
d
unda
n
t obje
c
t i
n
git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
o
hn
K
eeping
pull: suppr
e
ss error when no re
m
oteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
eepi
n
g
c
omple
t
i
on: handl
e
--[n
o
-]fork-po
i
nt options
to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keepi
n
g
completio
n
: comp
l
ete merge-base opt
i
on
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebas
e
: fix fork-point wi
t
h
z
ero arg
u
me
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
r
ebase: use reflog to find comm
o
n base with ups
t
re
a
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
o
h
n
Kee
p
ing
pull: use merge-
b
ase
-
-fork
-
point
w
hen ap
p
ropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
peek-
r
emote
:
remove deprecated alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
l
ost
-
found:
r
emove deprecated comman
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-
t
r
ee: rem
o
ve
d
eprecated
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n
Kee
p
ing
r
e
po-
c
onfig: rem
o
ve deprecated
a
lias
f
or "git c
o
nfi
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keepin
g
Documen
t
at
i
on/Makefile: make A
s
c
iiDoc dblat
e
x
d
i
r
c
onf
i
gurab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
o
hn Keeping
merge-recursiv
e
: fix parsing o
f
"diff-
a
lgori
t
hm" opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n Keeping
reset
:
handle submodule
w
i
th trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keep
i
ng
rm: re-u
s
e parse_pathspec's t
r
a
il
i
ng-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John K
e
epi
n
g
g
it_remote_helpers: rem
o
ve littl
e
us
e
d
P
ython
l
ibrary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
ing
rev
-
p
a
rs
e
(1):
logically
gro
u
p option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn Keep
i
n
g
rev
-
parse: remove
restrictions on some optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Kee
p
ing
p
ull:
change the
d
escript
i
on to
"integr
a
te" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
e
e
ping
push: avoid s
u
ggesti
n
g
"merging" re
m
ote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
ng
g
i
t
-
con
f
ig(
1
): c
l
arify
p
reced
e
nce of multipl
e
valu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Kee
p
i
ng
git
-
c
o
nfig: up
d
a
t
e
d
oc for
-
-
g
et with multi
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
com
p
letion: learn about --man-p
a
th
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
K
e
eping
c
o
mpletio
n
: handl
e
unstu
c
k form of
b
a
se git
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: al
l
ow moving the ro
o
t tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
ast-import:
all
o
w ls or filec
o
py of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
epin
g
fast-impo
r
t: set
v
a
l
i
d
mode on
root tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t930
0
: document fas
t
-import empty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
sub
m
od
u
l
e
: drop the
t
o
p-
l
evel requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-pars
e
: add --pref
i
x
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: sho
w
full path in
err
o
r mes
s
age
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403:
a
dd missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keepin
g
t7403: moder
n
ize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7
4
0
1
:
make ind
e
n
tation co
n
s
is
t
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
mergetool
-
-lib: refa
c
t
or {diff,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
Documentation/Makefile
:
move inf
o
dir to be
w
i
t
h
o
t
her
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Document
a
tion/M
a
ke
f
ile: fi
x
s
paces around a
s
signments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--interact
i
ve: respect diff
.
algor
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Kee
p
ing
git-
g
u
i: fix file nam
e
handling with non-emp
t
y prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keepi
n
g
fe
t
ch: don't t
r
y
t
o
update u
n
fetch
e
d
tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftool: fix dir-diff
when file
do
e
s no
t
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
:
handl
e
d
i
rectory/e
m
p
ty conflic
t
correct
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
J
o
hn Ke
e
p
ing
t/Makefil
e
: don't define TEST_
R
ES
U
LTS_DIRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Joh
n
Keeping
contrib/subtre
e
:
d
on
'
t de
l
ete remote branches if sp
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keepin
g
test output: respect $TEST
_
OUTPUT_DIRECTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepi
n
g
t/Ma
k
efile: remov
e
smoke te
s
t
ta
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keepi
n
g
merge-t
r
ee: fi
x
typo in "both chang
e
d identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/M
a
k
e
f
ile
:
fix result
h
andling with
T
E
ST
_
OU
T
P
U
T_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
r
ansport-helper: add '
s
igned-
t
ags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
tra
n
s
port-
h
elper
:
pass --signed-
t
a
g
s
=w
a
rn-strip to
.
.
.
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-strip
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
t
/tes
t
-lib
.
sh: fix TRASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n Keeping
merge-tree: don't
p
rint en
t
ries that match
"local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
ohn Keeping
gitremote
-
he
l
pers(1): clari
f
y r
e
fspec be
h
aviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: print gra
p
h output
n
ext
to submo
d
ule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
dif
f
:
allow unstuck ar
g
u
ments
with --diff-algorith
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
e
ping
git-merge(1): document
diff-a
l
gor
i
thm
o
ptio
n
to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bise
c
t:
a
void si
g
ned integer ov
e
r
f
low
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keep
i
ng
di
f
fc
o
re-break: don'
t
divide b
y
ze
r
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keepin
g
t7800:
run
-
-dir-d
i
ff tests wi
t
h and without syml
i
nks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n Keeping
t7
8
00: fix tests when difftool uses -
-
no
-
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Ke
e
ping
t
7800:
don
'
t hide
grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
d
i
f
f
tool: don't
o
v
e
rwrite modi
f
ied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn
K
e
e
ping
t78
0
0
:
m
o
ve '--symlinks' specific test t
o
the en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn
Keeping
m
er
g
e-tree:
fix t
y
po
i
n merge-tree
.
c::unreso
l
ved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fread error han
d
lin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
e
n
try:
fix filt
e
r
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
t2
0
03: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
i
fftool --d
i
r-diff: symlink all files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
difftool: avoid
d
ouble
s
las
h
es in sy
m
link ta
r
g
e
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-di
f
f
t
ool(1): fix
f
orm
a
tting of --symlink descripti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John K
e
eping
Revert
"
graph
.
c: ma
r
k private fi
l
e-sc
o
pe sy
m
bols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Joh
n
Ke
e
ping
Make
f
ile: m
a
ke mandir, htmldir and inf
o
di
r
a
b
s
olute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
rebase
-i: res
p
ect core
.
co
m
mentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
oh
n
Keeping
combine-diff
.
c: te
a
ch
combine
d
d
i
f
fs
about
line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: use dif
f
_
l
ine_prefix() where applica
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: a
d
d diff
_
lin
e
_pref
i
x f
u
nction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Ke
e
p
ing
diff
.
c
:
m
a
k
e c
o
nstant stri
n
g ar
g
um
e
n
t
s const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff:
w
ri
t
e prefix
t
o the corre
c
t
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn
K
e
e
pi
n
g
g
r
aph: outp
u
t padding
for merge subseque
n
t parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John K
e
e
ping
t4038: add tests
f
or "
d
i
ff -
-
c
c
--raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
ping
builtin/ap
p
l
y: tighten (
d
is
)
similarity index
par
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keepi
n
g
merg
e
to
o
l
-
-lib: lis
t
user c
o
nfigur
e
d
t
ools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Joh
n
Keep
i
ng
R
e
name {g
i
t-
=> git}
r
emote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keep
i
n
g
C
odingGuidelines: ad
d
Python coding
g
uid
e
line
s
commit
|
commitdiff
|
tree
2013-01-28
John Keepi
n
g
git
-
re
m
ote-testpy
:
fix path has
h
ing on Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John K
e
e
ping
mergetool-
-
lib: don't call "exit" in set
u
p
_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next