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 'sk/spawn-less-case-insensitively-from-grep-O-i' into maint
2014-05-27
J
o
hn Ke
e
ping
completion: add missing options
for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John
K
e
ep
i
ng
c
o
mpletio
n
: add a n
o
te that
me
r
ge options
a
r
e
sh
a
red
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keep
i
ng
b
u
iltin/mv: fix out of bo
u
nds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Ke
e
p
i
ng
builtin/mv: don't use
memory after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eepin
g
u
t
f8:
use correct type
for values in interv
a
l table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8:
fix iconv error detecti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keep
i
ng
note
s
-utils: handle
b
oolean no
t
es
.
rewritemode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John
Kee
p
ing
Makefile: re
m
o
ve red
u
n
dant obj
e
ct in
git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keeping
pull: suppress err
o
r wh
e
n
n
o
remoteref i
s
found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Kee
p
ing
completion:
handl
e
--[no-]for
k
-point options to gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
compl
e
tion: complete
m
erge-bas
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
ohn Keeping
reb
a
se
:
fi
x
f
o
rk-point wit
h
ze
r
o
a
rgu
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
Joh
n
Keeping
rebase: use reflog to find
c
ommon base with ups
t
ream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
pull: use merge-base -
-
fork-poi
n
t when appropri
a
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
ping
pee
k
-
remote: rem
o
v
e de
p
recated
a
lias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn
Keep
i
ng
l
o
st-f
o
und: remove deprecated c
o
mma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keeping
tar-tree: remove deprecated
c
ommand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
e
pi
n
g
repo
-
c
o
nfig:
r
emove deprec
a
ted al
i
as for "git
config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentatio
n
/Makefile: make AsciiDoc dblatex
d
i
r con
f
igura
b
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John K
e
eping
merge-r
e
c
urs
i
ve: fi
x
parsin
g
of "diff-algorit
h
m"
o
p
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
r
e
set: handl
e
s
u
bmodule wit
h
t
r
a
i
ling slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
ohn Keeping
r
m
: re-u
s
e
p
arse_pathspe
c
's trailing-
s
lash re
m
ov
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
Keeping
git_remote_h
e
l
pers:
r
emove
l
i
tt
l
e used Python lib
r
ary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Keeping
rev-parse(1): logi
c
ally gr
o
up op
t
ion
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn Keeping
rev-
p
a
r
s
e
: rem
o
ve restrictions on
some opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
o
hn Keeping
p
ull: ch
a
nge the description t
o
"i
n
t
egrat
e
" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
ng
p
ush: a
v
o
i
d suggesting "merg
i
n
g" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config
(
1): cla
r
i
fy precedence
of multip
l
e val
u
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
ohn Keeping
git-co
n
f
i
g
: u
p
date doc f
o
r --ge
t
with mu
l
tiple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
comple
t
ion: learn about -
-
ma
n
-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
K
e
e
ping
co
m
pletion: hand
l
e unstuck form of base gi
t
option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
i
n
g
fast
-
i
mport: allo
w
moving th
e
root
t
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
f
a
st-import: al
l
ow ls or fileco
p
y of the root t
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keepi
n
g
fast-import: set va
l
id mode on root tree in
"l
s
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
t9300: document fast-import empty path is
s
ue
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
K
e
e
pin
g
submodu
l
e: dro
p
the top-level
requireme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
r
e
v-parse: add -
-
p
refix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
su
b
mod
u
le: s
h
ow full path in error
m
essage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
t7403
:
add mis
s
ing && chaini
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t7403: modern
i
ze style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t7401
:
make in
d
enta
t
ion c
o
nsistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mer
g
etool--lib: ref
a
ctor {diff,me
r
ge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
D
ocu
m
entat
i
on/Ma
k
efile:
move infodi
r
to be
with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Docum
e
n
t
atio
n
/Makefile: fix spa
c
es around
a
ssignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
e
p
i
ng
add--inte
r
active: re
s
pect dif
f
.
algor
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gui: fix file name handling with non
-
empty prefi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
Jo
h
n Kee
p
ing
fetc
h
: don't try
t
o update
u
nfetched tr
a
cking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keepi
n
g
difftool: fix di
r
-di
f
f when
file does not
ex
i
st in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Joh
n
Ke
e
ping
m
erge-tree: h
a
ndle directory/empty con
f
lict corre
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Mak
e
file: don't define
TEST_RESUL
T
S
_DIRECTO
R
Y recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
c
ontrib/subtree
:
don't delete remo
t
e branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
Ke
e
p
i
n
g
test
o
utput: r
e
spect $TEST_OUTP
U
T
_
DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eeping
t/Makefi
l
e: remove s
m
oke t
e
s
t
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keep
i
ng
merge-tre
e
: fi
x
ty
p
o in "both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile: fix
r
esult
handling with TEST_OUTPUT
_
DIRECTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tr
a
n
sport-h
e
lper:
add 'signed-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tra
n
spo
r
t-hel
p
er: pass --signed
-
tags=warn-stri
p
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
fast-ex
p
ort:
add --signed-t
a
gs
=
war
n
-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
t
/
te
s
t-lib
.
sh: f
i
x
TRASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keepin
g
m
erge-tree:
d
o
n't
p
rint entries that match "l
o
cal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote
-
helpers(1): clarify refspec beh
a
viou
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keep
i
n
g
submodul
e
: p
r
int grap
h
output next to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
dif
f
: allo
w
u
n
stu
c
k
a
rguments with
-
-d
i
f
f
-algor
i
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
ep
i
ng
git-merge(1)
:
docu
m
e
n
t
d
iff-algorit
h
m o
p
tion to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect:
a
void signed int
e
g
e
r overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-br
e
ak: don'
t
divide by
zer
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t7800: run --di
r
-diff
tests
with and wit
h
out symli
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7800: fix te
s
t
s
wh
e
n difftool us
e
s
--
n
o-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Ke
e
ping
t7800:
d
on't hide gre
p
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
d
ifftool: don't
o
v
e
rwrite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Ke
e
p
ing
t7800: move '--sy
m
links' spec
i
fic
t
est to the
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Ke
e
ping
merge-tree: fix typo in
m
e
rge-tre
e
.
c
:
:unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fread error handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
entr
y
: fi
x
filter l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: m
o
dernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
ep
i
ng
dif
f
to
o
l -
-
dir-diff: syml
i
nk
all file
s
matching
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
difft
o
o
l: avoi
d
d
o
uble slashes in s
y
mlink t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
e
e
ping
g
i
t-dif
f
tool(1): fix formatti
n
g of --symlink
descriptio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
o
hn Keepin
g
R
e
vert "g
r
aph
.
c: mark private
file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
ohn Keep
i
ng
M
a
k
efile: make mandi
r
, htmldir and
infodi
r
absolu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
K
e
eping
rebase
-
i
:
respect c
o
r
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
combine-diff
.
c: teach
c
ombined dif
f
s abo
u
t line pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn
Ke
e
ping
diff
.
c: us
e
diff_line_
p
refix() where
app
l
icable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
n
g
diff: add diff_
l
i
n
e_
p
refix
fu
n
c
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
diff
.
c
: make constan
t
string argume
n
ts const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: write prefix to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keepin
g
gr
a
ph:
o
utp
u
t p
a
dd
i
ng
for merge sub
s
equent
p
a
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keep
i
ng
t4038:
a
dd
tests
f
o
r
"
d
iff --c
c
--raw <t
r
ee
s
>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply:
t
i
g
ht
e
n (dis
)
similarity inde
x
pa
r
sin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mer
g
etool--li
b
: list user co
n
figured
tools in
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keepin
g
Rename {git
-
=
>
git}remo
t
e
-helpers
.
t
xt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Codi
n
gGuidelin
e
s: add P
y
thon codi
n
g guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-rem
o
te-testpy: fix pat
h
hash
i
ng on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Keep
i
ng
mergetool-
-
lib: don't call "e
x
i
t" in set
u
p
_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-di
f
ftool: use git
-
merge
t
ool-
-
li
b
f
or "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
oh
n
K
e
eping
git-mergetool:
d
on't hardcode
'mergetool' in s
h
ow_tool_h
e
lp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn K
e
eping
g
i
t-mergetool:
r
emove redundan
t
assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-m
e
rgetool:
m
o
ve sho
w
_tool_he
l
p to me
r
getool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-r
e
mote-testpy:
c
all
p
r
i
nt as a
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-rem
o
te
-
te
s
tpy
:
don't do u
n
buffered text
I
/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next