repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
completion: add a note that merge options are shared
2014-05-27
John Keeping
co
m
pletion: add
a note that merg
e
options are share
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-03-11
J
ohn Keep
i
n
g
builtin/mv:
f
i
x out of bo
u
nds writ
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
builtin/mv: don't use
memory
a
fter
fre
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
K
eeping
utf8: use correct ty
p
e
f
or values
in int
e
rv
a
l table
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Keeping
utf8: fix iconv
error
d
etection
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Keeping
notes-u
t
il
s
:
han
d
le boo
l
ea
n
n
o
tes
.
rewritemo
d
e correctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-27
John
Ke
e
ping
Mak
e
fil
e
: re
m
ove redundant object in git-htt
p
{fetch
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-17
John Ke
e
pi
n
g
pull: suppr
e
ss error
w
hen n
o
remoteref is fo
u
n
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
John Ke
e
p
i
ng
co
m
plet
i
on: handle --[no-]fork-point opt
i
ons to git
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n K
e
eping
comple
t
ion: complete
merge-base options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-09
John Keep
i
ng
rebase: fix fork-point with
z
ero arguments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-10
J
ohn Keeping
rebase:
u
se reflog
t
o find
comm
o
n base with upstr
e
a
m
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
pull: use merge-
b
as
e
-
-
fork-point w
h
en appropriate
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
ping
peek-remote: remove depre
c
ated a
l
ias o
f
l
s
-
remote
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
ng
l
ost-fo
u
nd
:
remove
d
ep
r
ec
a
t
ed comm
a
n
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
t
ar-tree: re
m
ove
deprecate
d
command
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Keeping
repo-config: rem
o
ve d
e
p
r
eca
t
ed alias for "git config"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentat
i
on/
M
akefile: make AsciiDoc dbla
t
ex dir configurab
l
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-26
J
ohn Keepin
g
m
e
rge-recu
r
sive
:
fi
x
pa
r
sing
of "diff-al
g
orit
h
m" option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Keeping
reset:
h
andle submodul
e
with tra
i
l
i
n
g slash
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John
Keeping
rm: re-use parse_p
a
thspec's trailing-slash removal
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
gi
t
_remote
_
helpers
:
remove litt
l
e used Python li
b
rary
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John
K
e
e
ping
rev
-
parse(
1
): logically group opt
i
ons
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
eping
rev-parse: remove restric
t
ions on some options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: change the
desc
r
iption to "integrate" ch
a
nges
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
eping
push: avoid sug
g
e
sti
n
g "mer
g
ing"
r
emote changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
Jo
h
n Keeping
git-config(1): cl
a
r
ify pre
c
edence of
m
ultiple
value
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-03
John Kee
p
i
ng
git-config: update doc for
-
-get with multiple v
a
lues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John K
e
eping
completion: learn about --man-pa
t
h
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
c
o
mpletion: han
d
le uns
t
uck form of b
a
se git o
p
tion
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keep
i
ng
fast-import
:
allow m
o
ving the
r
oot tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
f
a
s
t
-
import: allow ls or fi
l
ecopy of
the root tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
ng
f
ast-import: set vali
d
mode
o
n root tree in "l
s
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
t930
0
: document fast-import empty pa
t
h issues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: dro
p
the top-level require
m
en
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-p
a
rs
e
:
a
dd --prefi
x
opt
i
o
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
submodule:
s
ho
w
fu
l
l pat
h
i
n error message
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
t7403:
a
d
d
missing && chaini
n
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
eping
t7403
:
mode
r
nize style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t740
1
: make ind
e
ntati
o
n consi
s
tent
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eepi
n
g
mergetool--lib: refactor
{
diff,me
r
ge}_c
m
d l
o
gic
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn K
e
eping
Docum
e
ntat
i
on/Ma
k
efile: move
i
nfodir to b
e
with ot
h
er
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Document
a
tion/Makefil
e
: fix
spaces around
as
s
i
g
nme
n
ts
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-12
John
Keep
i
ng
add--intera
c
tive: respect diff
.
algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-07
Jo
h
n Keeping
gi
t
-gui: fix file name han
d
ling with n
o
n
-
empty prefix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: don't try to u
p
date un
f
etched tracking
r
efs
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
John
K
eeping
difftool: fix dir-diff w
h
en file does not exist i
n
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
John K
e
epin
g
merge-tree: hand
l
e
d
irectory/empty
con
f
lict
c
orre
c
tly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Ma
k
e
f
ile: d
o
n't define TEST_RESULTS_DIRECTOR
Y
recursi
v
e
ly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-01
John Ke
e
ping
contr
i
b/sub
t
ree: don't d
e
le
t
e remote bran
c
hes if s
p
lit
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output:
resp
e
ct $TEST_OUTPUT_DIRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: re
m
ove smoke test ta
r
gets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tree: fix
typo in
"
b
oth
changed
i
dentically"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-27
John K
e
eping
t/Makefile: fix result handling
w
ith TEST_OUTPUT
_
DIRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
r
a
n
s
po
r
t-helper:
add
'signed-tags' capability
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
transport-
h
elper: pas
s
--sig
n
ed-tags
=
w
arn-strip to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keep
i
ng
f
a
st-e
x
port: add --signed-tags=warn-
s
tri
p
mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
t/test-li
b
.
sh: fix TRASH_DIRECTO
R
Y handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: d
o
n't p
r
int entries that matc
h
"l
o
cal
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitr
e
mote-helpers(
1
):
c
larify
r
e
f
s
p
ec behav
i
our
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn K
e
eping
s
ubm
o
dule: print graph
output next to
s
u
bmodule log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn
K
eeping
diff
:
a
l
low unstuck a
r
guments
with
--diff-algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge(1)
:
document
di
f
f-a
l
gorithm optio
n
to merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisec
t
: avoid
signed integer ov
e
rflow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn
Keep
i
ng
d
iffcore-break
:
don't divi
d
e by z
e
ro
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7
800: r
u
n -
-
dir-diff
t
ests with an
d
withou
t
s
ymlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t78
0
0
:
fix tests when difftool uses
--no-s
y
mlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keep
i
ng
t7800: don't hide grep o
u
tpu
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
dif
f
tool:
don't ov
e
rwrite
m
odif
i
ed file
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t78
0
0:
m
ove
'--symlin
k
s' spec
i
f
i
c
test t
o
the
end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn K
e
epi
n
g
merge-tree: fix typo in me
r
ge-tree
.
c:
:
u
n
resol
v
ed
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
re
f
s
.
c: fi
x
fread e
r
ror handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
e
nt
r
y: fix filt
e
r l
o
o
k
u
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n K
e
epin
g
t200
3
:
m
o
d
e
rnize style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keepi
n
g
difftool --
d
i
r-diff: sym
l
ink al
l
f
i
les
mat
c
hing the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
pin
g
difftoo
l
:
a
void doubl
e
slashes
i
n syml
i
nk targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
i
ng
git-difft
o
o
l
(
1
): fix f
o
r
matti
n
g of
--s
y
mlink
d
es
c
ription
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
John Keepin
g
Revert "graph
.
c:
m
ark pri
v
ate file
-
scop
e
symbols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
Joh
n
Keeping
Make
f
ile: make mandir, htmldir and infodir
absolute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
Keeping
r
e
bas
e
-i: respec
t
core
.
comm
e
ntc
h
a
r
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-diff
.
c
:
teach combine
d
d
i
ffs about line pref
i
x
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff
.
c: us
e
diff_
l
ine_prefix()
where
ap
p
licable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff: a
d
d diff_lin
e
_prefix
f
u
nc
t
ion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keep
i
ng
diff
.
c: make constant stri
n
g ar
g
uments const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
dif
f
: write prefix to the correct file
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph
:
output pa
d
d
ing
for merge s
u
bsequent
p
a
rents
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John
Keeping
t4
0
38:
a
dd tests for
"
diff -
-
cc
-
-raw
<
trees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
bu
i
ltin/apply: tighte
n
(d
i
s)simila
r
i
ty index parsin
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
ergetool--lib: list u
s
e
r
configure
d
tools in '--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
Joh
n
Ke
e
ping
Rename {g
i
t
-
=
>
git}remote-he
l
p
ers
.
tx
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John Kee
p
ing
Coding
G
uideline
s
: add
P
y
thon codin
g
guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
p
i
n
g
g
i
t
-remote-testp
y
:
fix
p
a
t
h
hashing on P
y
thon 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keep
i
ng
mergetool--lib: don
'
t
c
a
l
l
"exit" in
s
etup_too
l
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Keeping
git-di
f
ftool:
u
se git-merg
e
tool--lib f
o
r "--tool-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-m
e
rget
o
ol:
d
o
n
't hardcode 'mergetoo
l
' in s
h
ow_t
o
ol_help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mer
g
e
t
ool:
r
emove redu
n
dant a
s
s
ignment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-m
e
rgetool: move sho
w
_tool_help to mergetool--
l
ib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-remot
e
-testpy: c
a
ll print
a
s a fun
c
t
ion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
rem
o
t
e
-t
e
stpy: don't do unbuffered text
I
/
O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
K
eep
i
n
g
git-remote-testpy: hash
b
ytes
e
xplicitly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
next