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
Merge branch 'rd/test-path-utils' into maint
2015-09-25
John Keepin
g
Documentati
o
n:
f
i
x
section he
a
der mark-u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-10
J
o
h
n Keeping
M
akefile
:
fix
M
AKEFLAGS
t
e
s
ts with
m
ultiple flags
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-03-31
John Keeping
streaming
.
c:
fix a
m
eml
e
ak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John
K
eeping
completion: complete `git
push --fo
r
ce-with-lease=
`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
o
hn Keeping
completion: add some missing options to `git push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Jo
h
n Keeping
completion
:
c
o
mplet
e
"un
s
tuck"
`git pus
h
--recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keeping
r
ebase: o
m
it pa
t
ch-identical co
m
mits
w
ith
-
-fork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
Joh
n
Keeping
rebase--am: use --
c
herry
-
pick instead o
f
--
i
gnore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
complet
i
o
n: add missing options
f
or git-
m
er
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
completion: ad
d
a n
o
te
t
h
a
t
mer
g
e opti
o
ns are
sha
r
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
ohn Keeping
bu
i
ltin/mv: fix ou
t
o
f
bounds w
r
i
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
ing
builti
n
/mv: don't
u
se memo
r
y
a
fter
f
r
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
oh
n
Keeping
utf8: us
e
correct type f
o
r
value
s
in interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Ke
e
ping
utf
8
:
f
i
x iconv error dete
c
t
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Keeping
n
otes-utils
:
han
d
l
e
b
oo
l
ean notes
.
rewritemod
e
co
r
re
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefile: remove
r
ed
u
n
d
a
nt object in gi
t
-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keeping
pull: suppress er
r
or when no
r
emot
e
r
ef
is fo
u
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n Ke
e
ping
completion: handle --[
n
o-]fork
-
poin
t
options to gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Ke
e
ping
compl
e
tion:
c
omp
l
ete merge-base opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
r
e
b
a
se
:
f
ix fork-point with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebase: use reflog to
find com
m
o
n
base wi
t
h
u
pstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
pull: use mer
g
e-base --fo
r
k
-
p
oint when ap
p
r
o
pr
i
ate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
ng
peek-remote
:
re
m
ove
d
eprecated
ali
a
s of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
ee
p
ing
lost
-
fo
u
n
d
: remove deprecated c
o
mmand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepin
g
tar
-
tree: rem
o
ve
deprecate
d
c
o
mmand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keepi
n
g
rep
o
-
config: remove depr
e
c
ated alias for
"
git
config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Docume
n
tatio
n
/Makefile: make
A
sciiDo
c
dblatex
dir c
o
nfigurab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
K
eeping
m
e
rge-r
e
c
u
rsive: fix parsing of
"diff-algorithm" optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
Keeping
reset: ha
n
dl
e
submodule wi
t
h
tr
a
il
i
ng slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Ke
e
ping
rm
:
re-us
e
parse_pathspe
c
's
t
railing-slash rem
o
val
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John K
e
eping
g
it_remote_helpers:
r
emove little used
P
ytho
n
libra
r
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
eping
rev-parse(1): logic
a
l
ly
group opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn Keeping
rev-parse: rem
o
ve rest
r
ictions on s
o
me options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull:
c
hange th
e
d
e
script
i
o
n
to "inte
g
rate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Ke
e
ping
push: a
v
oid suggesting "me
r
ging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
eepi
n
g
git-config(1)
:
c
l
arify
p
recedence
of
multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-config: update
doc for --get with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Keepi
n
g
comple
t
i
on: learn
about --man-pat
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
Keeping
compl
e
t
ion:
han
d
l
e
u
nstuck form o
f
ba
s
e git op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
a
st
-
import: allow
movi
n
g the root
t
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fas
t
-
i
mport: all
o
w ls o
r
f
ilecopy of the root
t
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
fast-i
m
p
o
rt: s
e
t
v
al
i
d
m
ode
on root tree
i
n
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9
3
00
:
document
f
a
s
t-import e
m
pty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
s
ub
m
odule: dro
p
the
t
op
-
leve
l
req
u
irement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
K
ee
p
ing
rev-p
a
rse:
add --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Kee
p
ing
su
b
module: show f
u
ll
p
ath
i
n
e
rror message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keepin
g
t
7
403: a
d
d missing
&
& ch
a
ining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
t7403: mod
e
rnize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn
K
eeping
t7401: make indentation
consist
e
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
m
erg
e
tool--lib: refactor {diff,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Docu
m
entation/Makef
i
l
e:
m
ove
i
nfodi
r
t
o be
w
ith
o
the
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
oh
n
Keeping
Documenta
t
ion/Makefile: fix spa
c
es
a
r
ound assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
eping
add--inte
r
active:
r
espect di
f
f
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gui: f
i
x file name hand
l
ing wi
t
h
non-em
p
ty
p
r
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch:
d
o
n
'
t try to
update
unfe
t
ched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
Keeping
di
f
ftool: fi
x
dir-dif
f
when file doe
s
not
exist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John
Keeping
m
erge-t
r
ee:
handle directory/empty confli
c
t
c
o
rr
e
ctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/M
a
kefile: don't define TEST_RESULTS_D
I
RECT
O
R
Y recursi
v
el
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keep
i
ng
c
on
t
rib/subt
r
ee: don't delete
r
emote branches
if spl
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Jo
h
n Keepin
g
tes
t
output: respect $T
E
ST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
t/Makefile: remove smoke test
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
merge-
t
ree: f
i
x typo in "both changed ident
i
ca
l
ly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile: f
i
x resul
t
h
a
n
d
ling
w
i
t
h TE
S
T_OUT
P
UT
_
DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
tr
a
nsport-he
l
per:
add 'si
g
n
ed-tags'
c
a
pability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
trans
p
ort-h
e
lp
e
r: pa
s
s --signed
-
t
a
gs
=
warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-export: add --s
i
gned-tags=warn-stri
p
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n
Keeping
t/test-lib
.
sh: fix TRASH_D
I
RECTOR
Y
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
o
h
n Ke
e
ping
merge-
t
re
e
: don't pri
n
t entri
e
s that match "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
Ke
e
p
i
n
g
gitre
m
o
t
e-helpers(1
)
: clarify refspec b
e
haviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
su
b
module
:
p
rint
g
raph
o
utput
next
t
o
submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
diff: allow unstuck arguments w
i
th --diff-
a
lgorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-mer
g
e(1)
:
document d
i
ff-algorithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoi
d
sign
e
d integ
e
r
o
v
erflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-break
:
don
'
t di
v
ide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t780
0
: run --dir-diff t
e
s
ts
w
ith an
d
with
o
ut sy
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
pin
g
t7800:
f
ix tes
t
s whe
n
difftool
u
ses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: don't hide grep
o
utput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
oh
n
Keeping
difftool:
d
on't overwrite mod
i
fied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
e
p
i
n
g
t7
8
00: move '--symlink
s
' s
p
ec
i
f
ic te
s
t to
the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tre
e
:
fix typo in mer
g
e-tr
e
e
.
c::
u
n
resolv
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
r
e
f
s
.
c
:
fix fre
a
d error handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n K
e
e
ping
entr
y
: fi
x
filte
r
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
e
pin
g
t2003: modernize
s
t
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
n
g
difftool --dir-
d
i
f
f
:
s
ymlink all files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
di
f
ftool: avoid
double
s
lashe
s
in
s
ymlink target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-d
i
f
ftool(1): fix formatting o
f
--symlink d
e
scrip
t
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John K
e
ep
i
ng
Revert "gr
a
p
h
.
c
:
mark
p
rivate
f
i
l
e
-sco
p
e symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
K
e
epin
g
Makefile:
m
ake mandir, htmldir
a
nd infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
reba
s
e
-i:
respect core
.
co
m
mentcha
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combi
n
e-diff
.
c
:
teach
c
ombined di
f
f
s about
line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
Keeping
d
i
f
f
.
c: use diff_line_p
r
efix()
w
here applica
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
di
f
f
:
add diff_l
i
ne_prefix functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
d
iff
.
c:
m
ake constant
string arguments
c
onst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
dif
f
:
write prefi
x
t
o
t
he corr
e
ct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
e
p
ing
graph: out
p
ut
pad
d
i
ng for merge subsequent pare
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keepin
g
t4038: add tests for "diff --cc --
r
aw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
h
n Keeping
b
u
iltin/apply: tighte
n
(dis)similari
t
y in
d
e
x
p
arsi
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mer
g
e
t
ool--lib: list
user c
o
n
f
igured too
l
s in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
ename {git- => git}
r
emote-h
e
lpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGui
d
elines: add Pyt
h
on c
o
din
g
guidelines
commit
|
commitdiff
|
tree
next