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
date: use strbufs in date-formatting functions
2014-07-22
John Keepin
g
c
ompletion: comple
t
e `g
i
t push --force-wi
t
h-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
completi
o
n: add some
m
issing options to `git push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John
Keeping
comp
l
etio
n
: complete "unstuck" `g
i
t
pus
h
--recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keeping
rebase: omit patch-i
d
enti
c
al com
m
i
t
s with --fork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
Jo
h
n Keeping
r
ebase--am:
use -
-
c
h
erry-pic
k
in
s
tead
o
f
--ignor
e
-i
f
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Jo
h
n Keeping
c
o
mpletion: add missing opti
o
ns f
o
r git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
c
omplet
i
on: add a note
that m
e
rge op
t
i
ons a
r
e share
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
builtin
/
mv: fix
o
ut
of
b
ounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
h
n
Keeping
buil
t
in/mv: don't u
s
e
memor
y
after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keepi
n
g
u
t
f
8
: use correct type for
values in int
e
rval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Keep
i
ng
utf8
:
f
ix icon
v
e
rro
r
detect
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
h
n Keepin
g
notes-util
s
:
handle boolean notes
.
rewritem
o
de cor
r
ectl
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
J
o
hn Keeping
M
ak
e
f
i
le:
r
e
m
o
v
e
r
edu
n
d
a
nt object in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John K
e
e
ping
pull:
suppress error when no remoteref is f
o
und
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn Kee
p
i
n
g
completion: handl
e
--[no-
]
fork-
p
oint opti
o
ns to gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn Keeping
completion: c
o
mplete
m
erge-base options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
Joh
n
K
eeping
rebase: fix
f
ork-point with zero
a
rguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John
K
eeping
rebase: use reflog to find c
o
mmon bas
e
with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keep
i
n
g
pull: use m
e
r
ge-base
--fork-poi
n
t when appr
o
p
r
iate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek-remote:
r
emove depr
e
cated alia
s
of ls-re
m
ot
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepin
g
lost-fou
n
d: re
m
o
v
e depre
c
ated
c
ommand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
n
g
tar-t
r
e
e: remove dep
r
eca
t
ed
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
re
p
o-config:
r
emove d
e
p
r
ecat
e
d alias for "gi
t
c
onfig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Ke
e
ping
Doc
u
men
t
a
t
i
o
n/Makefile: make Asci
i
Doc dblatex
d
ir con
f
igurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
o
h
n
K
e
epin
g
merge-
r
ec
u
r
s
iv
e
: fix par
s
ing of
"
diff-algor
i
thm" opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Kee
p
ing
r
e
set: handle s
u
bmodule with
tra
i
ling
slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Ke
e
p
ing
rm: re-use parse_p
a
thsp
e
c's
t
r
ailing
-
sla
s
h rem
o
val
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keep
i
n
g
git_remote
_
helpers: remove litt
l
e used Pyth
o
n libr
a
ry
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-p
a
r
se(1): logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev
-
parse: remove restricti
o
ns on some optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keep
i
ng
pull:
c
h
an
g
e the de
s
cr
i
ption to "integrate
"
change
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn
Kee
p
ing
push: av
o
id s
u
gges
t
in
g
"merging
"
remot
e
ch
a
nges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
e
pin
g
g
it
-
c
onfig(1): cl
a
rif
y
precedence
of multiple va
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-co
n
fig: update doc for --get with multiple
v
a
lues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
Ke
e
ping
co
m
plet
i
on: learn about --ma
n
-
path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
Keepi
n
g
completi
o
n: ha
n
dle unstuck for
m
of base git opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-imp
o
rt
:
allow mov
i
ng the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
f
a
st-
i
m
p
ort:
a
l
low
ls or filecopy of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-i
m
port: set valid mode on root tree in "ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9300: document fa
s
t
-import empt
y
p
a
t
h issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
submodul
e
: d
r
o
p t
h
e top-le
v
el requi
r
emen
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
re
v
-p
a
rse: add --pr
e
f
i
x option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
submodu
l
e: sh
o
w
full path in erro
r
m
e
ssage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
t
74
0
3: add mis
s
ing &&
c
h
ai
n
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403
:
modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7
4
01: make inde
n
tation co
n
s
i
stent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
mergeto
o
l--lib: refactor {diff,mer
g
e}_cmd lo
g
i
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
K
eeping
Documentation/Makefile
:
move infodir
to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
Docu
m
entation/Makefile: fi
x
s
paces around a
s
signments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
hn Kee
p
ing
add--interactiv
e
: respect
d
i
f
f
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
ohn Keep
i
ng
git
-
gui: fi
x
fil
e
nam
e
hand
l
in
g
with non-e
m
pty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
o
hn
K
eepi
n
g
f
etch: don't try to update unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Jo
h
n Keeping
difft
o
ol:
f
ix dir-diff when file does
no
t
e
x
i
s
t
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Kee
p
ing
m
e
rge-
t
r
ee: ha
n
dle di
r
e
c
tory/empty co
n
flict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t
/
M
a
kef
i
l
e
:
don't defi
n
e T
E
ST_RESULT
S
_DIRECTORY rec
u
rsively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib/subtree:
do
n
't delete remote branches if
split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output: re
s
pect $
T
E
ST_OUTPUT_
D
IRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
mer
g
e
-tree: fix ty
p
o
in "both c
h
anged
identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John K
e
eping
t/Ma
k
efile: fix r
e
sult ha
n
d
ling with TEST_O
U
TPUT_D
I
REC
T
ORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tra
n
sport-hel
p
er: add
'signed-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
transport-helper:
pass -
-
si
g
ned-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n
Keeping
fa
s
t-e
x
port: add --s
i
gned-ta
g
s
=war
n
-
s
trip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
t/test-lib
.
sh: fix TR
A
SH
_
DIRECTORY ha
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Kee
p
ing
mer
g
e-tree: do
n
't print entries that match "
l
ocal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
hn K
e
ep
i
ng
gitremote-he
l
pers(1): cla
r
i
fy ref
s
pec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
sub
m
odule: print gr
a
ph
o
u
tp
u
t next to
s
ubmo
d
ule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow u
n
stuck argumen
t
s with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepi
n
g
git-merge(1): document diff-algo
r
ithm
o
ption to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid si
g
ne
d
in
t
eger overf
l
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffc
o
re-break: don't divid
e
by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
p
ing
t7
8
00: run
-
-dir-diff test
s
w
ith and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: fix tests when difftool uses --no-
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7
8
00: don't hid
e
grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eepin
g
difftoo
l
: do
n
't overwr
i
te modifi
e
d file
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7800: move '
-
-symlinks' sp
e
ci
f
ic test to t
h
e en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tree: fix typ
o
in m
e
rg
e
-tree
.
c
::unr
e
solved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
eping
ref
s
.
c: fix fread
e
rror handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
entr
y
:
f
ix fil
t
er lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keep
i
ng
t2003: modernize st
y
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
Keepin
g
difft
o
ol -
-
dir-diff: sy
m
link
a
ll fi
l
e
s
matc
h
in
g
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
K
eeping
difftool: avoid
d
ouble slash
e
s in symlink t
a
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
oh
n
Keeping
g
i
t-d
i
fft
o
ol(1): fix formatting o
f
--symli
n
k description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Reve
r
t "graph
.
c: mark priva
t
e
file-scope
s
ymbols
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn Keeping
Makefile
:
m
a
ke mandir, htmldir a
n
d
i
nfodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
rebas
e
-
i
: re
s
pect
c
ore
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-diff
.
c
:
teach combined
diffs about l
i
n
e
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c
: use diff_lin
e
_prefix()
where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: a
d
d diff
_
l
i
n
e_pr
e
fix funct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn
Ke
e
ping
d
i
ff
.
c
:
make co
n
sta
n
t string ar
g
uments
c
onst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
eping
di
f
f:
w
r
ite pre
f
ix to the correct
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keepin
g
graph: output padding for m
e
r
ge subsequen
t
paren
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Ke
e
p
ing
t4038: add tests for "diff
-
-cc
--r
a
w <trees>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eeping
b
u
iltin/apply: tigh
t
en
(
dis)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
erge
t
o
ol--lib: list use
r
c
onfigured tools
i
n
'
--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Keeping
Renam
e
{
git- => git}remote-
h
elpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
ohn Keeping
CodingGu
i
delin
e
s: add Pyth
o
n codi
n
g g
u
ideline
s
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Ke
e
ping
git-r
e
mote-testpy: fi
x
pa
t
h hashing on
Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool--
l
ib: d
o
n't call "exit" in setup_t
o
ol
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
K
e
eping
git-diff
t
ool: use git-mergetool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next