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
lockfile.c: add a new public function unable_to_lock_message
2014-05-27
John
K
eepi
n
g
completion: a
d
d
missing options fo
r
gi
t
-m
e
rge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Joh
n
Keepin
g
comple
t
ion: add a note
that merg
e
optio
n
s are s
h
a
r
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keep
i
ng
b
u
iltin
/
mv: fix
o
u
t of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keepi
n
g
buil
t
in/mv
:
don't use memory after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf
8
: us
e
correct
t
y
p
e
for valu
e
s in interva
l
tab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keeping
u
t
f8: fix iconv error det
e
c
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John K
e
eping
n
o
t
e
s-u
t
ils: han
d
le boolean notes
.
rewritemode
c
o
r
rectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
Jo
h
n
K
eeping
Makefile:
r
e
mo
v
e
redundant obje
c
t
in g
i
t-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Kee
p
in
g
pu
l
l: suppr
e
ss error when no remoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
complet
i
on: handle
--[no-]for
k
-
point options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn K
e
eping
completi
o
n: complete merge-base opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebase: fix fork-point wit
h
z
e
ro
a
rguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
reba
s
e: use r
e
flog to find
c
ommo
n
base with u
p
stream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
ohn Keeping
pu
l
l: use merg
e
-
b
ase
-
-fork-poi
n
t when
app
r
opriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
ng
pee
k
-remote: re
m
ove deprecated alias
o
f ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
los
t
-found: remove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
tar
-
tree:
remove deprecated comma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Ke
e
ping
repo-c
o
nfig: rem
o
ve
d
eprecated al
i
as for "git config
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
K
eeping
Documentat
i
o
n/
M
akefi
l
e
:
make
As
c
iiDoc dblate
x
dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merg
e
-recursive
:
fix par
s
ing o
f
"d
i
ff-algorithm" opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
ohn
K
eep
i
ng
r
e
set
:
h
andle su
b
m
o
dule wit
h
trailing slas
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
h
n Keeping
rm:
r
e-use parse_paths
p
ec's trailing-slash remo
v
al
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
K
eeping
gi
t
_remote
_
help
e
rs: remove little used Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Keep
i
ng
rev-parse(1
)
: logically grou
p
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
eepin
g
rev-parse: remove
re
s
trictions on s
o
me options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
p
ull:
c
h
ange the de
s
cription to "integrate" ch
a
nges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
eeping
pu
s
h: avoid suggesting "mergin
g
"
remote c
h
a
nges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
git-c
o
nfig(1): clarify pre
c
eden
c
e of
m
ultiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
g
it
-
co
n
fig: updat
e
d
oc for
-
-g
e
t with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
compl
e
tio
n
: learn abo
u
t --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John K
e
eping
completion: handl
e
uns
t
u
c
k form of
ba
s
e git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: all
o
w moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-im
p
ort
:
al
l
o
w
ls or f
i
lecopy of t
h
e ro
o
t tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
f
ast-import: set valid mode on root tree in
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepi
n
g
t
930
0
: document fast-imp
o
rt e
m
pty path
i
s
sues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn
Keeping
subm
o
d
u
l
e: dr
o
p
t
he top-leve
l
requir
e
m
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn
K
ee
p
ing
rev-parse: add --pref
i
x o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
submodule: show
f
ull p
a
th in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t740
3
: add missing &&
chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keepin
g
t
7403:
m
odernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
t7401: make
inden
t
ation con
s
istent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
merget
o
ol--lib: refacto
r
{diff,m
e
rg
e
}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
D
ocu
m
enta
t
ion/Makefile: move infodir to b
e
with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn K
e
eping
D
o
cumentatio
n
/M
a
ke
f
ile
:
f
i
x spaces around assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
hn Keeping
ad
d
--int
e
ractiv
e
:
res
p
ect
diff
.
al
g
orithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
ohn K
e
eping
git-gui
:
fix file n
a
me h
a
nd
l
ing with non-empt
y
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fet
c
h: don't try to updat
e
unfetched trac
k
ing
r
e
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
ohn
K
eeping
d
ifftool:
f
ix di
r
-
di
f
f
w
h
e
n fil
e
does n
o
t exi
s
t in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keepi
n
g
m
e
rge
-
tree
:
handle
directory/
e
mpt
y
conflict
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Kee
p
ing
t
/Makefile: don't
define TEST_
R
E
S
ULTS_DIRECTORY rec
u
rsively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John K
e
eping
contrib/subtree: don't delete
remo
t
e b
r
an
c
hes if
s
plit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Jo
h
n Keep
i
ng
test o
u
tpu
t
:
r
e
spect $TEST_O
U
TPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
t
/Make
f
ile:
r
em
o
ve smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepin
g
m
erge-tree: fix typo in "
b
oth change
d
i
d
e
ntically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John
K
eeping
t/M
a
kefile: fix
r
esult handling
w
i
t
h TEST_OUTPU
T
_
D
IREC
T
O
RY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-helper: add
'sign
e
d
-tags' capabilit
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tr
a
nsport-he
l
per: pass --sig
n
ed-tags=warn-str
i
p to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn K
e
e
p
ing
fast
-
e
xport
:
a
d
d --
s
i
gned-ta
g
s=
w
a
r
n-str
i
p
m
ode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
t/tes
t
-li
b
.
sh:
f
ix T
R
ASH_DIRECT
O
RY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John K
e
ep
i
ng
merge-
t
ree: don't
print
e
ntries
that match
"
l
oca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keepi
n
g
gitremote-
h
elpers(1
)
: clarify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
su
b
mod
u
le:
p
rint graph output next to submodu
l
e
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
e
eping
d
iff: al
l
ow unstuck arguments w
i
t
h --di
f
f-
a
lg
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
i
t-merge(1): docu
m
ent diff-al
g
o
r
i
t
h
m option to mer
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bis
e
ct: avoid signe
d
intege
r
over
f
low
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore
-
break:
d
on't d
i
vid
e
by z
e
ro
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Kee
p
ing
t7800
:
r
un --dir-d
i
ff tests w
i
th and
w
ith
o
ut sy
m
link
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00:
fix tests wh
e
n difftool
uses --no-syml
i
nks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7800: don't h
i
de grep ou
t
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n
K
eeping
difftool: don'
t
overwrit
e
modified
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800
:
move '--symlinks' spec
i
f
i
c test to the e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn Ke
e
ping
me
r
ge-tree: fix
t
y
po in merg
e
-
t
ree
.
c::unres
o
lved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fread error h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entr
y
:
f
i
x filter l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn
K
eeping
t
2
003: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
d
iffto
o
l -
-
dir-diff: sym
l
ink a
l
l
files match
i
ng the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftoo
l
:
a
void double slashes in syml
i
nk tar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
g
i
t
-difft
o
o
l(1): fix formatting
o
f -
-
sym
l
ink
desc
r
i
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "
g
raph
.
c: m
a
rk pri
v
a
te fi
l
e-
s
c
o
p
e symbols a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keepin
g
Makefi
l
e: m
a
k
e mandir, htm
l
dir and infodir a
b
so
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
rebase -
i
: respect c
o
re
.
co
m
mentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Kee
p
ing
combine-diff
.
c:
t
each com
b
ined d
i
f
fs about
l
in
e
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: us
e
d
i
ff_l
i
ne_
p
re
f
i
x() where applicab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
Keeping
diff: add diff_line_
p
re
f
ix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
diff
.
c
:
make co
n
stant str
i
ng
a
rgumen
t
s cons
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
d
i
ff: write prefix to the correc
t
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: out
p
ut
p
ad
d
ing
for
merge subs
e
quent par
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add tests for
"
dif
f
--cc --r
a
w <
t
rees
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Keeping
built
i
n/apply:
t
ighten
(
dis)similarity in
d
ex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Keeping
mer
g
et
o
ol--l
i
b: l
i
st
u
ser configur
e
d tools
i
n
'
--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Jo
h
n
K
eeping
R
e
na
m
e
{
git- => git}r
e
mote
-
hel
p
ers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Jo
h
n Keeping
CodingGuid
e
lines:
add Python coding guideli
n
es
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n K
e
eping
git-remote-te
s
tpy:
fix path
has
h
ing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
m
er
g
e
tool--
l
i
b
: don'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 Keeping
g
it-difftool:
u
se git-mergeto
o
l--li
b
f
o
r
"--tool-h
e
lp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
gi
t
-m
e
rgetool
:
don
'
t hardcode '
m
erg
e
to
o
l'
i
n show_too
l
_
h
e
l
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keep
i
n
g
g
it
-
mergetoo
l
: re
m
ove
r
edun
d
ant
ass
i
gnment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-mergetool: move show
_
tool_h
e
lp to merg
e
tool--li
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-re
m
ote-
t
estpy: call p
r
int as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n
K
eeping
g
it-remote-testpy: don't
do unbuffered
text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next