repo.or.cz
/
git
/
git-svn.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/index-pack-report-missing' into maint
2014-05-27
Jo
h
n Keeping
completion: add missing opt
i
ons for git-
m
erge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Kee
p
ing
c
omple
t
ion:
add
a note tha
t
m
erge options are share
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
o
hn Keeping
b
ui
l
tin/mv: f
i
x out of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n Keeping
b
ui
l
ti
n
/mv: don't u
s
e memory after
fre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keep
i
ng
utf8: us
e
correct type fo
r
values
in interval ta
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n Keeping
ut
f
8:
f
ix ico
n
v err
o
r
d
e
t
e
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
notes-ut
i
ls: handl
e
boolean notes
.
r
ewritemod
e
c
o
r
rect
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
J
ohn Keeping
Makefile:
r
em
o
ve re
d
undant obj
e
c
t
i
n
git-
h
ttp{
f
etch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
o
h
n Keep
i
ng
pull: suppress error wh
e
n no remoter
e
f i
s
found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Kee
p
in
g
c
om
p
leti
o
n: han
d
le --
[
no
-
]fork-
p
oint options
t
o gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
Keeping
completion: complete merge-bas
e
op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John
K
eeping
rebase:
f
ix
fork-
p
oint
w
i
th zero argumen
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
Jo
h
n Ke
e
pin
g
r
e
b
a
s
e: use reflog to
fi
n
d com
m
on
b
a
se with ups
t
ream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Ke
e
ping
pull: use merge-base --fork-point when app
r
opriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
eping
p
e
ek-remote: re
m
ov
e
deprecated alias
o
f ls-remo
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lo
s
t-found
:
remove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tre
e
: rem
o
ve
deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n
Keep
i
ng
repo-config: remove depr
e
cated alias for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John K
e
e
p
i
ng
Documentatio
n
/Makefile:
make AsciiDo
c
dblatex dir
c
onfigurab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
o
h
n
Ke
e
ping
merge-re
c
ursive: f
i
x parsing o
f
"diff-algorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Ke
e
ping
reset: handle submod
u
le with
trai
l
ing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
K
eeping
rm:
r
e-use
p
arse_pathspec's
t
r
ailing-s
l
ash
r
emov
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
g
it_rem
o
te_helpe
r
s: remove l
i
ttle used Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-
p
arse(1): logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keepi
n
g
rev-parse: remo
v
e restrictions on some
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
p
ull
:
chang
e
the descripti
o
n
to "int
e
grate" chang
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
eeping
p
u
sh: avoid suggesting "merging" remote chang
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
eping
g
i
t
-
c
o
nf
i
g(1): clarif
y
precedence
o
f multiple
v
al
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
ohn
Kee
p
i
ng
git-con
f
i
g
:
u
pdate doc for --get
w
i
th mul
t
iple v
a
lu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n
Keeping
compl
e
ti
o
n:
l
e
a
rn about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
K
eeping
completion:
h
a
ndle unstuck form of base 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 root
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n
Ke
e
p
ing
fa
s
t-im
p
ort: al
l
o
w ls o
r
filecopy of
t
h
e root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: set v
a
lid mod
e
o
n
r
oot tree i
n
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
oh
n
Keepi
n
g
t9300: document fas
t
-imp
o
rt
e
mpty p
a
th issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
sub
m
odu
l
e
: drop the top-le
v
el requirem
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
rev-pa
r
se: add -
-
pr
e
fix
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n
K
ee
p
ing
subm
o
dule:
s
how full path in er
r
or
m
essa
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t7
4
0
3
: add m
i
ssing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7
403:
modern
i
ze s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t
7
401: m
a
ke in
d
entation consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keepi
n
g
merg
e
tool--lib: r
e
fac
t
or {diff,merge
}
_
c
md lo
g
ic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
D
o
cumentation/Makefile: move infod
i
r to be wit
h
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
Keepi
n
g
Documentation/Makefile: fix sp
a
ces arou
n
d
assign
m
e
n
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John
K
eepin
g
add-
-
interactive: r
e
spect diff
.
algor
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John K
e
eping
gi
t
-gui: fix fil
e
name handling wit
h
n
on-
e
mpty
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keep
i
ng
fetch: do
n
't t
r
y to u
p
da
t
e unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Jo
h
n Keeping
d
i
fftool: fix dir-di
f
f when file do
e
s not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merg
e
-tr
e
e: hand
l
e director
y
/
e
m
p
ty c
o
nflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
J
o
hn Keeping
t/Mak
e
file: don't de
f
in
e
TE
S
T_RESULTS_
D
IRECTO
R
Y recursiv
e
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Ke
e
pin
g
contrib/
s
ubtree: d
o
n
't dele
t
e remote branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
t
e
st ou
t
pu
t
:
respect $TEST_OUT
P
UT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: r
e
move
smoke test ta
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eeping
merge-tre
e
: fix typo in "both
chang
e
d
i
dentic
a
l
l
y"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Joh
n
Kee
p
ing
t/Makefile: fix result
h
andling wi
t
h T
E
ST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
ee
p
ing
transpo
r
t-helper: add 'signed-tags'
c
apabili
t
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n K
e
eping
trans
p
ort-helper: pass --signed-tags=
w
ar
n
-
strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
f
a
st-ex
p
o
rt: add --
s
igned
-
tags
=
warn-str
i
p mo
d
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-lib
.
sh: fix TRASH_DIRECT
O
R
Y
han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keep
i
ng
merge-tree: do
n
't print entries that match "loc
a
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote-help
e
rs
(
1): c
l
arify refspec b
e
h
aviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: p
r
int graph out
p
u
t
n
ext to subm
o
dule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keeping
diff: all
o
w uns
t
u
c
k
a
rguments with
--diff-algo
r
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eep
i
ng
git
-
merge(1):
docu
m
ent
d
i
f
f-algorit
h
m option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n Keepin
g
bisect: av
o
id signed
i
n
t
eger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eep
i
ng
dif
f
c
o
re-break: don't divide
b
y z
e
ro
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Ke
e
ping
t
7
800
:
r
un
-
-d
i
r-
d
i
f
f tests
w
it
h
and
w
it
h
out sy
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t
7
8
00:
f
i
x
tests
w
hen difft
o
ol uses --n
o
-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7
8
00: don't
hid
e
g
r
ep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
difftool:
don
'
t o
v
erwri
t
e
mo
d
i
fied fil
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keepi
n
g
t7
8
00: move '--syml
i
nks'
sp
e
ci
f
i
c
t
est to
the e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tree: f
i
x typo
i
n
m
erge-tree
.
c:
:
unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
oh
n
Keeping
refs
.
c: fix fread e
r
ror
h
andling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keep
i
ng
entry: fi
x
filte
r
l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t
2
00
3
: modernize sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
difftool --dir
-
diff: symlink all f
i
l
es matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
K
e
eping
difftool: avoid
d
o
uble sla
s
hes in
s
ymlink ta
r
get
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
git-
d
if
f
too
l
(1): fi
x
f
ormatting of --sym
l
ink descript
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
o
hn Keepi
n
g
Revert "grap
h
.
c: mark pri
v
ate
f
ile-scope symb
o
ls as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Make
f
ile: make mandir, htmldir
and infodir absol
u
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Ke
e
ping
rebase -i: respect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
combine-diff
.
c: te
a
c
h
combined dif
f
s a
b
out line pre
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
diff
.
c: use diff_l
i
ne_prefix()
wher
e
applicabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
dif
f
:
add diff_line
_
prefix
f
unction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
K
e
eping
dif
f
.
c:
m
a
ke constant string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
diff: write prefix to the corr
e
ct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
grap
h
: output padd
i
ng
f
or m
e
rge subsequent
pa
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add tes
t
s for "diff --cc --raw
<
trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Ke
e
pin
g
builtin/
a
pp
l
y: ti
g
h
t
en (dis)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Ke
e
ping
mergetool--
l
i
b
: list us
e
r configured to
o
ls in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Re
n
ame {g
i
t
-
=
>
git}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuideline
s
:
add
Pyt
h
on c
o
ding
g
u
i
de
l
ines
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Keeping
git-remote-
t
e
s
tpy: fix path
h
ashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn Keeping
mer
g
etool--lib: do
n
't
call
"exit" i
n
set
u
p_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
ping
git-difftool: use git-
m
ergeto
o
l--lib
for "-
-
t
o
ol-h
e
lp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keepi
n
g
gi
t
-mergetool: don't
hardcode 'mer
g
etool' i
n
s
how_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-mergetoo
l
: remove redund
a
nt assignme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mergetool: move show_tool
_
help to mergeto
o
l-
-
lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
oh
n
Kee
p
i
ng
gi
t
-re
m
ote-testpy
:
cal
l
print as a fu
n
cti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
gi
t
-remo
t
e
-
t
e
st
p
y
:
don'
t
do
unbuff
e
red text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next