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
RelNotes: correct name of versionsort.prereleaseSuffix
2015-03-31
John Keepin
g
stream
i
ng
.
c
: fi
x
a meml
e
ak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
ohn K
e
e
ping
completion: comple
t
e `
g
it pus
h
-
-
force-with-
l
e
ase=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keepin
g
completio
n
: add some mi
s
s
ing options to `git
push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
completion: complete "u
n
stuck" `git
p
ush
--recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keeping
rebase: omit patch-identical commits with --
f
ork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
J
o
hn Keep
i
ng
re
b
ase--am: use
--cherry-pick i
n
stead of
--ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Joh
n
K
eep
i
ng
completi
o
n: a
d
d miss
i
n
g o
p
tions f
o
r
git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
ohn K
e
ep
i
n
g
c
omplet
i
on: add a note that merge options are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Ke
e
ping
b
u
ilt
i
n/mv: fix out of bo
u
nds wr
i
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n
Keeping
buil
t
i
n/mv: don't use memory
a
fter free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
h
n
Keeping
utf8: u
s
e co
r
r
e
c
t type for values in
inter
v
al tabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Ke
e
ping
utf8: fix iconv error
d
e
tecti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keep
i
ng
notes-utils: h
a
n
d
le b
o
ol
e
an no
t
es
.
r
e
wr
i
te
m
ode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefile:
remove redund
a
nt object in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
ohn Keeping
pull: suppress error when no remoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Joh
n
Ke
e
pin
g
compl
e
ti
o
n: hand
l
e --[no-]fork-p
o
int opt
i
ons
t
o git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John K
e
eping
c
ompl
e
t
ion: co
m
p
l
e
t
e
m
e
rge-base o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
o
hn Keeping
reb
a
s
e: fix fo
r
k-point with zero ar
g
uments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John
Keeping
reb
a
se: use reflog to find common base with up
s
tream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
p
ull: us
e
m
e
rge-base --fork-point when a
p
propria
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
peek-re
m
ote: remove deprecated alias of ls-
r
emote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
eping
lost-
f
ound
:
remove
deprecated
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tre
e
:
remove deprecated com
m
and
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keepin
g
rep
o
-config: remove deprecate
d
ali
a
s
for
"git conf
i
g"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
K
eeping
Documentat
i
on/Makefile: ma
k
e
A
sc
i
i
D
oc
d
blatex
dir conf
i
gu
r
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
K
eeping
me
r
ge-recursive: fi
x
pa
r
sin
g
o
f "diff-algorithm"
o
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset: han
d
l
e submodul
e
with trailing sl
a
s
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-use pa
r
se_path
s
pec'
s
trailing
-
s
l
ash remo
v
al
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_r
e
mote_helpe
r
s:
remov
e
littl
e
u
sed Pytho
n
l
ibrary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
eeping
rev-parse(1): logic
a
lly
gr
o
up optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
ping
rev-parse: remov
e
rest
r
ic
t
i
ons on some option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull:
c
h
a
nge the
d
escription to "integra
t
e
"
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push:
av
o
id sugge
s
ting "merg
i
n
g" remote
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
eeping
g
it-con
f
ig
(
1):
clarify
prec
e
dence of
m
ult
i
ple va
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John
K
e
e
ping
g
i
t-con
f
ig
:
upd
a
te doc
for --get with multiple v
a
lues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
comp
l
etion: learn abo
u
t --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keep
i
ng
comple
t
ion: handle unstuck form of
b
as
e
g
i
t
optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
ast-import: allow moving the
r
oot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
a
st-import
:
al
l
ow l
s
o
r
filecopy of the r
o
ot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
e
e
p
i
n
g
fast-import:
s
et valid mode on root
t
r
e
e in
"
l
s
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
ng
t
9
300: doc
u
ment fas
t
-import empty
p
a
th issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
u
bmod
u
le: dr
o
p
t
he top
-
l
evel requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
re
v
-parse: add
--prefix optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule:
show full path in erro
r
me
s
sa
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
ee
p
ing
t7403: add miss
i
ng && cha
i
ni
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403:
m
odern
i
ze style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keepin
g
t
7
401
:
make indentation
consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn
K
e
e
ping
mergetool--lib: r
e
factor {di
f
f,mer
g
e}_cmd
l
og
i
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
Documentation/Makef
i
le: move infodir to be wi
t
h other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentation/Makefile: fix spaces aroun
d
assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
hn Keeping
a
d
d--interactive:
respect d
i
ff
.
a
l
gori
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keepi
n
g
git-gui: fix file
name handling with non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
oh
n
Keepi
n
g
fetch: don'
t
try t
o
update unf
e
tched 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
w
h
e
n f
i
le do
e
s not exi
s
t in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
m
e
r
ge-tree: handl
e
dire
c
tory/empty
c
o
n
flict correc
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
Joh
n
Keeping
t
/
M
ak
e
file: don't
define TEST_RESULTS_
D
IRECTO
R
Y recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John K
e
eping
c
o
ntri
b
/subtr
e
e:
d
on
'
t delete remote branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John K
e
epin
g
test output: r
e
s
p
e
ct $TEST_OUTPU
T
_
D
I
R
ECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: remov
e
smoke test tar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Keeping
m
e
r
ge-tree: fix typo in "both changed identi
c
ally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Jo
h
n Keeping
t/Makefile: fix result handling w
i
th TEST
_
OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-helper:
a
dd 'sig
n
ed-tags
'
capab
i
lity
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
transport-hel
p
er: pass --signed
-
tags=warn
-
strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
fast-export: add
--signed-tags=wa
r
n-strip
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-
l
i
b
.
sh: fix
TRASH_D
I
RECTO
R
Y
h
andling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Joh
n
Keeping
m
erge-tree: don't print entr
i
es th
a
t matc
h
"l
o
cal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
Keeping
g
itr
e
m
ote-helpers(1):
clarify refspec
b
ehaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: print graph outp
u
t n
e
xt to submodule
l
og
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow
u
nst
u
ck a
r
guments with
-
-dif
f
-
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
g
it-merge(1
)
: document diff-algor
i
thm op
t
ion to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bi
s
ect: a
v
oid signed int
e
ger overf
l
ow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn
K
eeping
diffcore
-
break: don'
t
divide b
y
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800
:
run --dir-diff t
e
st
s
with a
n
d
w
ithout symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
fix tests when difftool uses --no-symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Ke
e
pin
g
t78
0
0:
don'
t
hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
p
i
ng
difftool
:
d
on
'
t ove
r
write mod
i
fied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t
7
800
:
m
ove '--symlinks' sp
e
c
i
fic test to th
e
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn K
e
eping
m
e
rge-tree: fix typ
o
in merge-t
r
ee
.
c:
:
unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: f
i
x fread error ha
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Ke
e
p
ing
entry:
f
ix
filter loo
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t
20
0
3:
m
o
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
ee
p
ing
di
f
ftool --dir-diff: s
y
mlink
all files
m
atch
i
n
g th
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
diffto
o
l
: avoi
d
d
o
u
ble slas
h
e
s in symlink tar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
git-d
i
f
f
tool(1): fix formatting o
f
--s
y
mlink de
s
c
ript
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John K
e
eping
R
e
v
ert
"grap
h
.
c: mark
p
riv
a
te
file-scope
symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile:
m
ake m
a
ndir, htmldir
and infodir a
b
solute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Keeping
rebase -i
:
resp
e
ct core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
K
eeping
combine-di
f
f
.
c: tea
c
h combined
d
iffs about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
dif
f
.
c: use diff_line_prefix()
w
h
ere appl
i
cable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: ad
d
diff
_
line_pref
i
x f
u
nction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make
c
onstant strin
g
arg
u
ments con
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
diff: write prefi
x
to the correct
f
ile
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keep
i
n
g
graph: output
p
add
i
ng for me
r
ge subsequent pa
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add tests
f
or "diff -
-
cc --raw <tree
s
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Kee
p
ing
bui
l
tin
/
apply: tighte
n
(
d
is)similarity index par
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
K
eeping
me
r
ge
t
ool--lib:
l
ist user
c
o
nfigur
e
d tools in '-
-
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
ohn Ke
e
ping
Rename {git- =>
git}remote-help
e
rs
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn Keep
i
ng
CodingG
u
idelines:
a
dd Pyth
o
n coding
guideli
n
es
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn Keeping
git-rem
o
te-testp
y
: fix path hashin
g
o
n
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
o
h
n
Keeping
mergeto
o
l--l
i
b: don't
cal
l
"e
x
it" in setup_
t
ool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next