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
fetch-pack: refactor parsing in get_ack
2014-05-27
John
Keeping
co
m
pletion: ad
d
mis
s
i
ng
o
ptions for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
co
m
p
l
etion: add a note that
m
e
r
ge options are
shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
ohn
K
e
e
ping
bu
i
ltin/mv:
f
ix out of bou
n
ds wr
i
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keepin
g
b
u
i
ltin/mv:
don't
u
s
e
memory a
f
t
e
r free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: use correc
t
type for valu
e
s in inter
v
al table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
u
t
f8: fix ico
n
v error dete
c
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
notes-u
t
ils: handle bool
e
an
n
ote
s
.
rewritemode co
r
rectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John K
e
ep
i
ng
M
a
kefile
:
remove redundant
o
b
ject in git-http{fet
c
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
Joh
n
K
eep
i
ng
pull:
s
u
ppress
error w
h
en no remot
e
ref is fou
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John K
e
eping
co
m
pletion: ha
n
d
l
e --[no-]fork-po
i
n
t
op
t
ions
to
g
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
comple
t
ion:
c
omple
t
e
m
erge-base options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
ohn Keeping
rebase: fix
f
ork-point with zero argumen
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
Jo
h
n Keeping
rebase:
u
s
e reflog to find common base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
ohn Keepi
n
g
pull:
u
se merge-ba
s
e --fork-point when
ap
p
ropriat
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn
K
eepi
n
g
peek-re
m
ote: remo
v
e d
e
p
r
ecated alia
s
o
f l
s
-
remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost
-
found:
r
emove deprecat
e
d command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tree: remove dep
r
ec
a
t
ed co
m
mand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keeping
repo
-
config: re
m
ove deprec
a
ted
a
lias for "git
conf
i
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
o
h
n
Kee
p
ing
D
oc
u
mentation/M
a
kefile
:
make AsciiDoc
d
b
la
t
ex dir
c
onfigurabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John K
e
eping
me
r
g
e
-recursive: fix pa
r
sing of "dif
f
-algo
r
i
t
hm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
re
s
et: handle
submo
d
ule with tr
a
il
i
ng slas
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Ke
e
ping
rm:
re-use parse_
p
athspec's traili
n
g-slash
removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Ke
e
pin
g
g
i
t_remote_h
e
l
p
ers: remove little
u
sed Python librar
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse
(
1):
logically group opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev
-
parse:
remove restrictions o
n
some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Kee
p
ing
pull: ch
a
nge the
descrip
t
i
on
t
o "integrate
"
chan
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
e
ep
i
n
g
push:
avoid sugg
e
s
t
i
ng
"
merging" remote ch
a
nges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(1): cl
a
rify pr
e
cede
n
ce o
f
m
u
ltip
l
e values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-
c
onfig: update doc f
o
r
--get with mu
l
tiple
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
K
ee
p
ing
comple
t
ion:
l
e
arn
a
b
out --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Kee
p
i
n
g
completion: handle unstuc
k
form
o
f
bas
e
git
optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
fast-i
m
port: allow m
o
ving the root
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keeping
fa
s
t-import: allow ls or fi
l
e
c
opy of t
h
e ro
o
t tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
ng
fast-import: set
valid mode o
n
roo
t
tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
t
9
3
00: document fa
s
t-import e
m
pty path iss
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
su
b
mod
u
le: drop the top-level requirem
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
rev-par
s
e: add -
-
pref
i
x
opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
u
bmod
u
le:
show fu
l
l 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
t
7
403: add missi
n
g
&& chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t74
0
3
: modernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: make indent
a
tion consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
mer
g
e
t
ool--lib: ref
a
cto
r
{dif
f
,merge}_c
m
d logi
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
e
ep
i
ng
Do
c
um
e
nt
a
t
i
on/Makefile: move inf
o
dir
to be with o
t
her
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
Documen
t
at
i
on/Mak
e
file:
fix spaces aro
u
nd ass
i
gnments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add-
-
inte
r
active: resp
e
ct diff
.
algorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keep
i
ng
git-gui:
fix file name handli
n
g wit
h
n
o
n-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John
K
eepin
g
fetc
h
: do
n
't
try to upd
a
te unfetch
e
d tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John K
e
eping
diffto
o
l: fix
d
ir-diff w
h
en file
d
oes not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John
K
eeping
merg
e
-tree: hand
l
e directory/empty confl
i
ct
c
orrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t
/Ma
k
efile: don'
t
d
e
fine TEST_RES
U
LTS_DIR
E
CTORY rec
u
rsivel
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
cont
r
i
b
/sub
t
ree: don't delete r
e
m
o
te bran
c
hes if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Joh
n
K
ee
p
ing
test output: res
p
e
c
t
$
TEST_OUTP
U
T_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepi
n
g
t/Makefile: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Kee
p
ing
merge-tree: fi
x
ty
p
o in "both c
h
anged
identi
c
a
l
ly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile: fix
r
esult ha
n
dling with T
E
ST_OUTPUT_DI
R
ECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tran
s
port
-
helper: add
'
s
igned-tags' capa
b
i
l
i
ty
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Kee
p
ing
tran
s
port-
h
elper
:
p
ass --signed-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
e
e
ping
f
ast-export: add --signed-t
a
gs=
w
arn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
e
p
i
n
g
t/
t
est-lib
.
s
h
: fix TR
A
S
H
_DIR
E
CTORY ha
n
dl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keep
i
ng
me
r
ge-tree: don't print entries
that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Kee
p
ing
gitr
e
mote-helpers(1)
:
c
l
a
rify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: print graph o
u
tput next to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
eping
dif
f
: allow unstuck ar
g
u
m
ents wi
t
h --diff-algori
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
i
t-merge(1): d
o
cument diff-algorithm op
t
ion to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n Keep
i
ng
bisect: avoid sig
n
ed in
t
ege
r
ove
r
flow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn Keeping
diffcore-bre
a
k: do
n
'
t
divide b
y
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t78
0
0:
r
un
-
-dir-d
i
ff t
e
sts with
and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t
7
8
00: fix
t
e
s
ts when difftool
u
ses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn
K
eeping
t7800: don't hid
e
g
r
e
p out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
diff
t
ool: do
n
't ove
r
write m
o
dif
i
ed files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t
7800: move '--symlinks' specific t
e
s
t
to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keepi
n
g
merge-
t
ree:
fix
t
y
po
i
n merge-t
r
e
e
.
c::u
n
resolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
h
n
Keeping
r
e
fs
.
c: fix
f
read error han
d
l
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
entry:
fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keep
i
ng
t2003: mode
r
nize s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
difftool --
d
i
r
-di
f
f: sy
m
li
n
k all files matchin
g
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
difftool
:
avoid
d
oubl
e
s
las
h
es in syml
i
nk targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keep
i
ng
git-difftool(
1
):
fix formatt
i
ng o
f
--symlink des
c
r
ipt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Jo
h
n Keeping
Revert "gra
p
h
.
c
:
mark private file-scope
s
ymbo
l
s as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
M
a
kefile: mak
e
mandir, htmldir and infodir
a
bsolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
r
ebase -i: respect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
K
eepi
n
g
combine-diff
.
c: teach combin
e
d di
f
fs
a
bout line pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Ke
e
p
ing
diff
.
c:
use diff_line_prefix
(
) whe
r
e applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keepin
g
d
i
ff: add dif
f
_l
i
ne_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
dif
f
.
c: make consta
n
t str
i
ng argument
s
c
on
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
d
i
ff: write p
r
ef
i
x to the
c
or
r
e
c
t
f
ile
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
grap
h
: outpu
t
pad
d
i
n
g
for merge subsequent
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn Keeping
t
4038: add tests for "dif
f
--cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
ping
builtin/apply: tighten
(dis)simila
r
ity
index parsi
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
m
erg
e
t
oo
l
--l
i
b:
l
ist user configu
r
e
d
tools i
n
'-
-
tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keepin
g
R
en
a
me
{git-
=> g
i
t}r
e
mote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn Keepin
g
CodingGuid
e
lines: add Python coding
g
uidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keepin
g
git-remote-tes
t
py: fix path hashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John K
e
eping
mergetool--lib: don't
c
all
"
exit" in setup_to
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-dif
f
tool:
u
se git-m
e
rgetool
-
-lib
fo
r
"
-
-t
o
ol-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
ep
i
ng
git-
m
erge
t
ool: don
'
t hard
c
ode '
m
ergetool'
in
show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: remove redundant assi
g
nment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
g
it-mergetool: move sh
o
w_tool_help to mer
g
eto
o
l--
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote
-
testpy: call pr
i
nt as
a
f
u
nction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-remote-testpy: don'
t
do
u
nbuffe
r
e
d text I
/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next