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 'fa/merge-recursive-no-rename'
2016-02-23
John Keeping
t
9
2
0
0: avoid g
r
e
p
on non-AS
C
II data
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2016-02-23
J
ohn
K
e
eping
t8005: a
v
oi
d
grep
o
n non-
A
SCII data
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2016-01-25
John Keeping
completion: add missing git-
r
e
b
ase options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-12-11
John Keeping
send-email:
enable SSL level 1
d
ebu
g
outpu
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-11-24
J
o
hn Keep
i
ng
sen
d
-email:
d
ie if CA pa
t
h
doesn'
t
exist
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-11-20
Jo
h
n
K
eepin
g
send-e
m
ail
:
expand path
i
n sendemail
.
smt
p
sslcertpath
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-25
Jo
h
n Ke
e
pi
n
g
Documentation: fix se
c
tion
h
e
ader
mar
k
-
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-11
John Keep
i
ng
Documentation/git-reb
a
se: fix
--
n
o-aut
o
stash formatting
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-11
J
o
hn Keeping
rebase: s
u
ppo
r
t -
-
no-autostash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-10
John Keeping
M
a
kefile: fix MAKEFL
A
G
S
test
s
with multi
p
le f
l
ags
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keeping
in
t
erpret-
t
raile
r
s: allow running outside a repository
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keepin
g
t
e
st-l
i
b-functions: detect t
e
st_when_finis
h
ed in subshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
Jo
h
n K
e
eping
t7800: don't use tes
t
_
c
onfig in a subshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John
K
eeping
t
est-lib-func
t
ions: sup
p
ort "te
s
t_con
f
ig
-C <dir>
.
.
.
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John
Ke
e
ping
t5801:
don't u
s
e test_when_finished
in a su
b
shell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keep
i
ng
t
7610: don't use test_config in a subshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
Joh
n
Keeping
t6300: add tests
f
or "-loc
a
l" date form
a
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
J
o
hn Keeping
t63
0
0: mak
e
UTC
a
nd
loca
l
dates differen
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keeping
dat
e
: check for "
l
ocal
"
b
efore any
t
hin
g
else
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
J
ohn Keep
i
ng
t6300: add test for
"
raw
"
date f
o
rmat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
Jo
h
n Keeping
t63
0
0: intr
o
d
u
ce test_dat
e
()
helper
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
J
o
h
n Ke
e
pin
g
Docum
e
ntation/rev-list: don't list d
a
t
e formats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
Jo
h
n Keep
i
ng
Documentation/gi
t
-for-each
-
ref: do
n
'
t
lis
t
dat
e
formats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keepi
n
g
Docume
n
tatio
n
/
config: d
o
n
'
t list date format
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
J
ohn Keeping
Documentati
o
n/bl
a
me-options: don't list da
t
e formats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-03-31
John Keeping
strea
m
ing
.
c: fix a
memleak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
o
hn Keeping
complet
i
o
n
: complete
`
g
i
t push --force-with-
l
ease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John
Keep
i
ng
completion: add some mi
s
s
ing o
p
t
i
o
n
s to `gi
t
push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Jo
h
n Keepi
n
g
co
m
pletion: complete "unstuck
"
`git p
u
s
h --recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keeping
rebase: omi
t
patch
-
i
d
entical commits with
-
-fork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Kee
p
i
n
g
rebase--am: use --cherry-pi
c
k instead of --ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Ke
e
ping
c
ompletion: add m
i
ssing options fo
r
git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
o
hn Keepin
g
completion
:
a
d
d a note t
h
a
t merg
e
options are shar
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
builtin/mv:
fi
x
o
ut of b
o
unds
write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
builti
n
/mv: d
o
n't u
s
e mem
o
ry af
t
e
r fre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf
8
: use cor
r
ect type
for values in
inter
v
al table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
Keepi
n
g
utf8: fix iconv
e
rror
detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Keep
i
ng
n
otes-ut
i
ls: handle bool
e
an notes
.
re
w
ritemode
c
orrect
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
Jo
h
n Keeping
Makefile
:
remove redundant objec
t
in
git-h
t
tp{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
Joh
n
Keeping
p
u
ll: suppress error when no rem
o
ter
e
f is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Joh
n
Keeping
c
o
mpletion: h
a
n
dl
e
--[no-
]
fork-point options to
git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Kee
p
ing
completion: c
o
mplete
m
erge-base o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebase:
f
ix f
o
rk-point with zero
a
r
g
uments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebase: use re
f
lo
g
to fi
n
d
c
ommo
n
base with
u
pstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keepi
n
g
pull:
u
se merge-bas
e
--fork-point
w
hen ap
p
ropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
p
ing
peek-re
m
ote: remove
d
e
preca
t
ed
alias o
f
l
s
-remo
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepin
g
lost-found: remove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
e
e
ping
tar
-
tr
e
e
:
remove deprecated comm
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keep
i
ng
repo-conf
i
g: re
m
ove
d
eprec
a
ted alias for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Joh
n
Keeping
D
o
cumentation/Makefile:
m
ake Ascii
D
oc dblatex di
r
configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
mer
g
e-r
e
cursive: fix pa
r
s
i
n
g
o
f "diff-algor
i
thm" op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset:
handle submodule with t
r
ailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepin
g
r
m: re-use
parse_pa
t
hspec's trailing
-
sla
s
h remo
v
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Joh
n
Keepin
g
gi
t
_remote_h
e
l
pers: remove
l
i
tt
l
e us
e
d Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
ping
rev-p
a
rs
e
(1): logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-pa
r
se: remove
r
e
strictions on som
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John
K
eeping
pull: change
t
he descript
i
on
t
o
"in
t
e
g
rate
"
chang
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
push: avoi
d
suggesting "merging"
r
emote
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(1): clarify pr
e
c
edence of
m
ult
i
ple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
ohn K
e
e
ping
git-conf
i
g: update do
c
for --get with multiple valu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
K
e
e
pin
g
compl
e
ti
o
n:
le
a
rn abou
t
--
m
a
n-p
a
th
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keeping
completion:
handle unst
u
ck f
o
rm of base git opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
K
eeping
f
ast-im
p
ort: allow moving t
h
e r
o
ot
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
fast-import: al
l
ow ls or fil
e
cop
y
of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-impo
r
t: set valid mode
on root tree i
n
"ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9300: document f
a
st-
i
mport empty
p
a
t
h
i
ssues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
e
p
ing
submo
d
ule:
drop the top-l
e
v
e
l req
u
ireme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
re
v
-parse:
add --pr
e
fix optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Kee
p
ing
submodul
e
:
s
h
o
w ful
l
p
ath in e
r
r
or
m
e
ss
a
ge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
t7403: a
d
d mi
s
s
ing && chainin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t740
3
:
m
odernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keepin
g
t7401
:
make i
n
dentati
o
n consisten
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
m
e
rgetool
-
-lib: refacto
r
{diff,merge}_c
m
d logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Kee
p
ing
Documentation/Makefile:
m
o
v
e i
n
fodir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Document
a
tion/Makefile: fix space
s
ar
o
und assign
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John
K
eeping
add--inter
a
ctiv
e
:
res
p
ect diff
.
a
l
gorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keepi
n
g
g
i
t-gui: fix
f
ile na
m
e handli
n
g
wit
h
non-empty
p
re
f
ix
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 u
n
fe
t
ched tracking ref
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John K
e
e
ping
difftool: fix dir-diff when fi
l
e
d
oes not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n Keepin
g
merge-tree: handle director
y
/empty
conflict corre
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefil
e
: don'
t
defi
n
e
TEST_RESU
L
TS_DIRECTOR
Y
recursiv
e
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Jo
h
n Ke
e
ping
c
o
ntrib/subtree: don't dele
t
e
re
m
ote bran
c
he
s
if sp
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keepin
g
tes
t
o
utp
u
t: resp
e
ct
$
TEST_OU
T
P
U
T
_DIR
E
C
TOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefi
l
e: r
e
move smoke
test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Keep
i
ng
merg
e
-
tree:
f
i
x
t
y
p
o
i
n
"both chan
g
ed identi
c
ally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John
Ke
e
ping
t
/
Make
f
ile: fi
x
result
handling with
T
EST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
transport-helper: ad
d
'sign
e
d-t
a
gs' ca
p
ability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
tra
n
sp
o
rt-
h
elper: pass --signed-tags
=
warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-export: add --
s
igned-
t
ags=warn-s
t
rip mod
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
t/test-li
b
.
sh: f
i
x TRASH_D
I
RECT
O
RY handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
o
h
n Keeping
me
r
g
e-tree:
d
on
'
t
p
r
i
nt ent
r
ies that ma
t
c
h
"local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
g
itre
m
ote-helpe
r
s(1): cl
a
rify
r
e
f
spec
beha
v
iour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keepin
g
submodul
e
: print graph outpu
t
n
ex
t
to s
u
b
mod
u
le
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eep
i
n
g
diff: a
l
low unstuck argumen
t
s with --dif
f
-algorith
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
ing
git-merg
e
(1): document diff-algori
t
hm
opti
o
n to mer
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepin
g
bise
c
t
: avoid si
g
ned integer overflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Kee
p
ing
diffcore-br
e
ak: don't
d
ivide by ze
r
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t78
0
0: r
u
n --dir-
d
iff
tests with and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t7800: fix te
s
t
s
when
difftool uses --no-sym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n
Keeping
t7800: don'
t
hide grep outp
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next