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 'jk/more-comments-on-textconv' into maint
2016-01-25
John Keeping
complet
i
on
:
add missing git-rebas
e
opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-12-11
Joh
n
Keeping
sen
d
-emai
l
: enable SSL level
1
debug output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-11-24
J
o
h
n Keeping
sen
d
-e
m
ail: die
i
f
C
A
p
a
th doesn'
t
ex
i
st
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-11-20
J
o
hn Keeping
sen
d
-email: expand path in sendema
i
l
.
s
m
tpsslcer
t
path
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-25
John
K
ee
p
ing
D
ocumentation: fix sec
t
i
on header m
a
rk-up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-11
John Keeping
Docu
m
entation/git-rebase
:
fix --n
o
-
a
utostash form
a
t
ting
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-11
John
K
e
ep
i
ng
rebase: support --no-a
u
tostash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-10
John Keepin
g
Make
f
ile: fix
M
A
K
EFLAGS
t
e
s
t
s
wi
t
h multi
p
le fla
g
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John
K
e
eping
interp
r
e
t
-tr
a
ilers:
a
llow running outside a repo
s
itory
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
Jo
h
n
Keeping
test-lib-funct
i
ons: de
t
ect test_
w
h
e
n_finis
h
ed in sub
s
h
e
ll
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
J
o
hn
Ke
e
ping
t7800
:
do
n
't us
e
test_config in
a
subshel
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
Joh
n
Keeping
test-li
b
-functions: sup
p
o
r
t "test_config -C <dir>
.
.
.
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John Keeping
t5
8
01: do
n
't
u
se t
e
s
t
_wh
e
n_fin
i
shed in a s
u
bshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-08
John
Keeping
t7610: don't use test
_
c
o
nfig in
a
subshell
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keep
i
n
g
t6300: add tests for "-local" date for
m
ats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John
K
eeping
t6300: m
a
ke UTC
a
n
d
lo
c
a
l dates diff
e
rent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
J
o
hn Keeping
d
a
t
e: check
f
o
r "
l
ocal" be
f
ore any
t
hing el
s
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John
Keeping
t6300: add test for "raw" date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
J
oh
n
Keeping
t6300: intr
o
duce tes
t
_date() helper
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
Joh
n
Keeping
Doc
u
ment
a
tion/rev-list: don
'
t l
i
st
d
ate format
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keeping
Documentation/g
i
t-for-each-
r
ef: don't list date forma
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
J
o
hn Keeping
Documentation/
c
on
f
ig: don't list da
t
e formats
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-09-03
John Keepin
g
D
oc
u
m
e
n
t
ation/bla
m
e
-options: don't lis
t
d
a
te
f
or
m
a
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2015-03-31
John Keeping
streaming
.
c: fix
a memleak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
com
p
leti
o
n: com
p
l
et
e
`git p
u
sh --force-wi
t
h-lease=
`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Joh
n
Keeping
c
ompletion: add some missing options to `git p
u
sh`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John K
e
ep
i
ng
completio
n
: co
m
plete
"
un
s
tuc
k
" `gi
t
push --recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John
K
eeping
rebase: omit patch-identical co
m
mits wit
h
--fo
r
k-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
Joh
n
K
eeping
rebas
e
--am: use --cherry-pick instea
d
o
f --ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Kee
p
ing
com
p
l
e
tion: add mis
s
ing o
p
tio
n
s for git-
m
erge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John
K
eeping
completio
n
: add
a
n
o
te that m
e
rge options ar
e
shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
Joh
n
K
e
e
ping
built
i
n
/
mv: fix out of
boun
d
s write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
builtin/mv: don't use memory after free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Keeping
utf8
:
u
s
e co
r
rect t
y
pe for values in interval t
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n K
e
e
p
ing
u
t
f8: fix iconv error detec
t
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Keeping
not
e
s-utils: ha
n
d
le bool
e
a
n
notes
.
rewr
i
tem
o
d
e
c
orrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
Joh
n
Kee
p
ing
Makefile: remove
redundant object in git-http{fet
c
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
Jo
h
n Keeping
pull: suppress
e
rror when no remoteref is fo
u
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Kee
p
in
g
completion: ha
n
dle --[no-]f
o
rk-point opt
i
ons to
git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keep
i
ng
completion:
c
omplete merge-base
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
o
hn
K
eeping
reba
s
e:
f
ix fork-p
o
in
t
with zero argu
m
e
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
reb
a
se
:
u
se r
e
flog t
o
f
ind
common base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keep
i
n
g
p
u
ll: use merge-
b
ase --f
o
rk-point when ap
p
ropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Keeping
peek-remote: re
m
ove deprecat
e
d alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
ping
lost
-
foun
d
:
re
m
ove
d
epr
e
c
ated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
tar-tree: r
e
m
ove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
ng
repo-config: remove
d
epreca
t
ed a
l
ias for "gi
t
c
onfig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
D
o
cumentation
/
Makefile: make AsciiDoc dblate
x
di
r
configurab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
o
hn Kee
p
ing
merg
e
-recursive: fix par
s
ing of "diff-alg
o
rithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
ohn Ke
e
pi
n
g
reset: handl
e
submod
u
l
e
w
ith trailin
g
slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n Keeping
rm: re-use par
s
e_pathspec's trail
i
n
g-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
o
hn
K
eeping
git_remote
_
helpers: remove l
i
t
t
le
u
sed Python libr
a
ry
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn Keeping
rev-par
s
e(1): logic
a
ll
y
group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
ing
rev-parse: remo
v
e restric
t
i
o
n
s on so
m
e
optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John
K
eeping
pull: change the de
s
cr
i
pti
o
n to
"
integrate" chan
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
ohn Keeping
p
u
sh:
avoid
s
uggesting "merging" remote change
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config
(
1): clarify pr
e
c
e
denc
e
of multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-config: u
p
date do
c
for
-
-get with
multiple v
a
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completio
n
: lear
n
about --ma
n
-
path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keeping
c
ompletion: handl
e
unstuck
f
orm o
f
b
a
se
git
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
f
a
st
-
imp
o
rt:
a
llow movin
g
the root t
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keep
i
ng
fas
t
-
import: allow ls or
filecopy
of the root
t
r
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
fast-
i
mport: set valid mode on root tre
e
i
n
"ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
K
e
e
p
ing
t9300: do
c
ument f
a
st-import
emp
t
y
path
issu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submo
d
ule: d
r
op
t
he
top-level requir
e
ment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-
p
arse: ad
d
-
-
prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
ubmodule: show full path in
e
rror mess
a
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403
:
add
missing
&
&
c
hain
i
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t740
3
: mode
r
niz
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7
4
01: make indentation consi
s
t
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
mergetool--lib: refac
t
or {diff,merge}
_
cm
d
logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
Document
a
t
i
on
/
Make
f
il
e
: move inf
o
dir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
D
oc
u
mentation/Makefile: fix sp
a
c
e
s around a
s
sig
n
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keepi
n
g
ad
d
--int
e
ractiv
e
: respe
c
t diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
ohn Keepin
g
git-gui: fix file name
handl
i
ng with non
-
empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John
K
eepin
g
fet
c
h: do
n
't try to update unfetched trac
k
i
n
g re
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Jo
h
n
Keep
i
ng
difftool: fix dir-diff when file
does n
o
t exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
ohn Keeping
m
erge
-
t
ree:
han
d
le director
y
/empty co
n
f
lict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefile: d
o
n't
define TEST_RESULTS
_
D
I
RECTO
R
Y
re
c
ursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John K
e
epi
n
g
contrib/su
b
tree: don't delete remot
e
branches if
split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Joh
n
Keep
i
n
g
t
est outpu
t
: respect $TEST_OU
T
PUT_DIRECTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepi
n
g
t/Makefile: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tr
e
e:
f
ix typo in "both change
d
identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keep
i
ng
t/
M
akefile: fix result h
a
ndling with TEST_OUTPUT_
D
I
RECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
tran
s
port-helper: a
d
d
'signed-ta
g
s' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn K
e
eping
t
r
ansport-helper
:
pa
s
s --si
g
ned-tags=warn-s
t
rip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
fast-expor
t
: add --si
g
ned-tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/
t
est-lib
.
sh: fix
T
RASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
me
r
ge-tree: don
'
t
p
r
i
n
t entries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Joh
n
Keep
i
ng
gitremote-helpers(1): clarify r
e
fspec be
h
aviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodul
e
: print graph out
p
ut
next to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
diff: a
l
low unstuck argu
m
e
nts with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
eping
git-merge(1
)
: docume
n
t
d
i
ff-
a
lgorith
m
op
t
i
on to mer
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn Keeping
bisect: avoid s
i
gned inte
g
er overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
d
i
ffcore-bre
a
k: don't di
v
ide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t78
0
0: r
u
n --dir-diff tests with and without
s
ym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800
:
fix t
e
sts when dif
f
t
o
ol uses
--no-syml
i
nks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t7800: don't hide gr
e
p
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
di
f
ftool
:
d
o
n't overwrite modi
f
i
e
d
f
iles
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t
7
800:
move '-
-
symlink
s
' sp
e
cific
test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next