repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into maint
2015-09-10
John Keeping
Makefile: f
i
x MAKEF
L
AGS te
s
ts wi
t
h
multiple fl
a
g
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-03-31
Jo
h
n Kee
p
ing
st
r
eami
n
g
.
c: fix a me
m
l
e
ak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John
K
e
eping
comp
l
etion
:
complete `git push
--force-with-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
o
hn Keepi
n
g
completion: ad
d
some missing options to `git push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
c
o
mple
t
ion: com
p
lete "u
n
stuck" `g
i
t push --recu
r
se
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
J
ohn Kee
p
ing
r
ebase: omit patch-
i
dentica
l
commits with
--fork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keeping
reb
a
s
e
-
-
am: us
e
--cherry-pick inste
a
d
of --ignor
e
-
if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
ohn Kee
p
ing
completion
:
add missing optio
n
s for gi
t
-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
completion:
add a note that merge
o
ptions are shar
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John K
e
eping
builtin
/
mv: fix out o
f
b
o
u
nds
w
rite
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
builtin
/
mv
:
don't use mem
o
ry after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: use corr
e
c
t type for values in
interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Keeping
utf
8
: fi
x
iconv err
o
r
d
e
tection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
n
o
t
es-u
t
i
ls:
ha
n
dle bool
e
an notes
.
rewritemode c
o
r
r
ectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
Jo
h
n Keeping
M
a
kefile:
r
e
move redundant
obj
e
c
t
in
g
it-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John
Kee
p
ing
pul
l
: suppress e
r
ror w
h
en no remoteref is fo
u
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
com
p
let
i
on
:
handl
e
--[no-]fork
-
point options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
eepin
g
c
ompletion: co
m
plet
e
merge-b
a
s
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
Jo
h
n Keepin
g
rebase: fix fork-point with zero
arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
r
e
base: use reflog to find co
m
m
o
n
b
a
se
with upstre
a
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Joh
n
Keeping
pu
l
l: use mer
g
e-base -
-
fork-poin
t
wh
e
n appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Keeping
peek-
r
emo
t
e:
remo
v
e deprecate
d
alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
l
o
st-foun
d
: remove deprecated comman
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tree:
r
emove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
e
eping
repo-co
n
fig: remove deprecated alias for
"
git
c
onfig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
K
ee
p
ing
Documentation
/
Ma
k
e
file: make
A
sciiDoc dbla
t
ex
d
ir co
n
figurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
Joh
n
K
eepi
n
g
merge
-
recursive: f
i
x par
s
ing of
"d
i
ff-algorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Keeping
reset: handle submodul
e
with tr
a
iling s
l
ash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-use parse_pathspec
'
s trail
i
n
g-s
l
ash re
m
o
val
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Joh
n
K
ee
p
ing
git_remote
_
he
l
pers: remove li
t
t
le used Python l
i
brary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-par
s
e(1): logically
g
roup options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev
-
par
s
e:
rem
o
ve res
t
rictions on some option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John K
e
eping
pull:
c
ha
n
g
e the descr
i
ption to
"integrate
"
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn Keeping
push:
avoid sug
g
esting
"
merging" remote c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Ke
e
pi
n
g
git-config(1): cla
r
ify prece
d
ence o
f
multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Kee
p
ing
gi
t
-
config: u
p
date do
c
f
o
r --get with multiple
v
alues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Ke
e
ping
comp
l
etion: learn about -
-
man-
p
ath
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n
Keeping
co
m
p
l
et
i
on: handle u
n
stuck for
m
o
f
b
ase git
option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
fa
s
t-import: al
l
ow
m
oving the r
o
ot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
f
a
st-i
m
por
t
:
allow
l
s or filecopy of the
r
oot
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
fast-i
m
p
o
rt:
s
et valid mode on root tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keeping
t9
3
00: d
o
c
u
m
e
nt fast-
i
mp
o
rt empt
y
pa
t
h issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
submo
d
ule: drop the
t
op-le
v
el requiremen
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
rev-
p
arse: add --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n K
e
eping
subm
o
dule: sho
w
f
u
ll pa
t
h i
n
err
o
r
m
essage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t74
0
3: add missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
t
7403: mode
r
nize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: make
i
ndenta
t
ion consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
mergeto
o
l--l
i
b: refactor {diff,mer
g
e}_
c
md logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
Doc
u
mentation/Makefile:
m
ove infodir
t
o be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentation
/
Makefile: fi
x
spaces around assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
ohn Keeping
add
-
-i
n
teractive: respect dif
f
.
alg
o
ri
t
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gui: fix file
na
m
e handling with non-e
m
pty pre
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Ke
e
ping
fetch: don'
t
t
ry to
update
u
nfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
K
eepin
g
dif
f
t
ool:
f
i
x
d
ir-dif
f
wh
e
n
file does n
o
t
exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John
K
eeping
merge-tree: handle directory/empty
conflict c
o
rrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Kee
p
ing
t/Makefile: don't define TE
S
T_RESULTS_DIRECTORY recursivel
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Joh
n
Keep
i
ng
c
ontrib/subtree: don't delete remote
bran
c
hes if
spli
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test
output:
r
es
p
ec
t
$TES
T
_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n
K
eepin
g
t/Ma
k
ef
i
l
e
:
remove smoke test t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepin
g
merge
-
t
ree:
f
ix t
y
p
o
i
n "bo
t
h cha
n
ged
i
dentically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Kee
p
i
n
g
t/Makefile: fi
x
r
e
sult handlin
g
with TE
S
T_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
transport-
h
elp
e
r
: add 'signed-ta
g
s' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
transport
-
h
elper: pass --si
g
n
e
d-tags=w
a
r
n
-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
fast-export: a
d
d --signed-tags=
w
arn
-
s
t
rip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eepin
g
t/test-lib
.
sh:
f
ix TRASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't print en
t
ries that match
"
local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote
-
h
e
lpers(1
)
:
clarif
y
r
e
f
spec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
h
n Keepin
g
subm
o
dule
:
p
r
int graph o
u
tput next
t
o
submod
u
l
e log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow u
n
stuck ar
g
uments wi
t
h
--d
i
ff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-me
r
ge(1
)
: document diff
-
algo
r
ithm option to me
r
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n Keeping
bisect: av
o
id signed integer ov
e
r
flow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-break:
d
on't divi
d
e
by
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eepi
n
g
t78
0
0:
run -
-
dir-diff tes
t
s wit
h
and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Kee
p
ing
t7
8
00: fix test
s
wh
e
n difftool uses
-
-n
o
-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: don't hide grep
o
u
tput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keep
i
n
g
d
ifftool
:
don't o
v
er
w
rite m
o
dified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t780
0
:
move '--syml
i
n
k
s' spe
c
i
f
ic test to th
e
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn Keeping
merge-tree: fix
typo in me
r
g
e
-
t
ree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fread error
h
andlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
entry:
f
ix fil
t
er
l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003:
m
odernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keep
i
ng
difftool --
d
ir-diff: symlink all files matc
h
i
n
g the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: a
v
o
id do
u
b
le
slashes in symlin
k
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-diffto
o
l(1): fix formatt
i
ng
o
f --syml
i
nk descript
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keepin
g
Rev
e
r
t
"
gr
a
ph
.
c: mark private
f
ile-scop
e
sym
b
ols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Jo
h
n Keeping
Makefile:
make mandir, ht
m
ldi
r
and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: respect co
r
e
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
p
i
n
g
co
m
b
i
ne-diff
.
c: teach com
b
in
e
d
diffs about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
ee
p
ing
di
f
f
.
c: use diff_
l
ine_pr
e
fix() where ap
p
lica
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add dif
f
_li
n
e
_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff
.
c
: make constant string
a
rguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
d
i
ff: writ
e
prefix to the
c
orrec
t
f
ile
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keeping
graph:
o
utput
padding for merge
s
ubsequent paren
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
hn Kee
p
i
n
g
t
4038:
a
dd tests for "diff
-
-cc --raw
<trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keepin
g
b
uiltin/apply: tig
h
ten (dis)similarity
i
ndex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
merget
o
o
l--
l
ib: list user c
o
nf
i
g
ure
d
t
o
ols in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {g
i
t
- => g
i
t}remote-helper
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn Keeping
Co
d
ingGuideli
n
es: add Python codi
n
g guidelines
commit
|
commitdiff
|
tree
2013-01-28
John K
e
epi
n
g
git-remote-testp
y
:
fix pat
h
hash
i
ng
o
n Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next