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
revision: drop useless string offset when parsing "--pretty"
2014-07-16
J
o
h
n K
e
epin
g
rebase: omit patc
h
-iden
t
ic
a
l commits wit
h
--fork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keeping
reba
s
e
-
-am: use --cherry-pic
k
ins
t
ead of --ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
o
hn
K
eep
i
n
g
com
p
letion
:
add
m
issing
o
ptions for g
i
t-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John K
e
eping
com
p
l
e
tion:
add a note that
m
erge
options are
s
hared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keepin
g
built
i
n/
m
v: fi
x
out of b
o
unds wri
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Ke
e
ping
builtin/mv: do
n
'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 valu
e
s in interval tab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keepin
g
utf8: fix iconv erro
r
detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
notes-ut
i
ls: handle boolean notes
.
r
ew
r
i
t
em
o
de correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Ke
e
ping
Makefile: remove redu
n
da
n
t
o
bj
e
c
t in gi
t
-http{fe
t
c
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John K
e
eping
pull:
s
uppress erro
r
wh
e
n n
o
remot
e
re
f
is
f
ound
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
co
m
pletion: hand
l
e --[no-]
f
or
k
-
p
oint o
p
tions t
o
git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn K
e
eping
completion: complete merge-ba
s
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keepin
g
rebase: fix
f
ork-point w
i
th z
e
ro
arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Kee
p
ing
rebase: use reflog t
o
find
common base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
pull: u
s
e merge-base -
-
fork-point when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek-
r
emote: remove d
e
precated
a
lias
of
ls-
r
emote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keeping
l
ost-found: remo
v
e
depreca
t
ed
c
o
m
mand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tre
e
: remove deprecat
e
d command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Kee
p
ing
repo-config: remo
v
e deprecated al
i
as for "git
c
onfi
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentati
o
n
/
M
akefile: make AsciiDoc dblatex di
r
c
o
nfigurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keepi
n
g
me
r
ge
-
recursive: fix
p
a
rsing of "
d
i
f
f-algorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keep
i
ng
reset: han
d
le
s
ubmo
d
ul
e
with trailin
g
sla
s
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
Keeping
rm: re-use pars
e
_paths
p
e
c's t
r
ailing-s
l
ash re
m
oval
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
oh
n
Keeping
git_remo
t
e_helpers
:
remove littl
e
used Python
l
i
brar
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-p
a
rse(1): logicall
y
g
r
oup optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keepin
g
rev-parse:
r
emove restrictions on
so
m
e optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keepin
g
pull: cha
n
g
e the description
t
o "integrate
"
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
p
ush: avoid sug
g
esting
"
mer
g
ing" remote chan
g
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
ng
git-conf
i
g(1
)
: clarify precedence of
mult
i
p
l
e
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keepi
n
g
gi
t
-c
o
n
f
i
g: update do
c
for --get
wi
t
h
m
ultiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Kee
p
ing
compl
e
ti
o
n: lea
r
n
a
bout --ma
n
-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
com
p
l
e
t
i
on: handle unstuck f
o
rm of base
git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keeping
fast-imp
o
rt: a
l
low moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
K
e
e
p
ing
fas
t
-import: allow l
s
or
f
i
l
ecopy
o
f the
r
o
o
t
t
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
fast-import: set valid mode
o
n r
o
ot tree in "l
s
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t93
0
0
:
document fa
s
t-imp
o
rt empty
path i
s
sues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submo
d
ule: drop the top-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
re
v
-pa
r
se: add --prefix o
p
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
sub
m
odule:
s
h
o
w full
p
ath in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7403: add missing &&
c
haining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
t74
0
3: modernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401:
make indentati
o
n con
s
istent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Ke
e
p
i
ng
merg
e
t
o
ol--lib
:
refact
o
r
{diff,merge}_cmd l
o
g
i
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
Doc
u
mentat
i
o
n
/Makefile: m
o
ve in
f
o
d
ir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Ke
e
ping
Do
c
umentatio
n
/Makefile: fix spaces aro
u
nd as
s
i
g
nments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
h
n K
e
eping
a
d
d--interactiv
e
:
respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keepi
n
g
git-gui:
f
ix file
n
ame h
a
nd
l
ing w
i
th
n
on-em
p
ty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John
Keeping
f
e
tch: don't try
t
o
update unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John K
e
e
p
ing
di
f
ftool: fix dir-diff whe
n
file does
n
ot ex
i
s
t
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Kee
p
i
n
g
merge-
t
ree: h
a
ndle d
i
r
ectory/empty conflict correct
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Ke
e
ping
t/Makefile
:
don't defin
e
TEST_RESUL
T
S_DIRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
Keeping
c
ontrib
/
subtree: don't del
e
te remote branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Ke
e
p
i
ng
t
e
st ou
t
put: r
e
spec
t
$
TEST_OUT
P
UT_D
I
REC
T
ORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Kee
p
i
n
g
t/Make
f
il
e
: remo
v
e smoke te
s
t targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
h
n
K
eeping
merge-tree: fi
x
typo in
"both
c
han
g
ed identically
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Jo
h
n K
e
epin
g
t/M
a
k
efile
:
fix result han
d
ling with TEST_
O
UTP
U
T_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Kee
p
ing
transp
o
rt-hel
p
er: add 's
i
gned-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
t
r
a
nsport-helper: pass -
-
signed-tag
s
=warn
-
s
t
rip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
f
ast
-
exp
o
rt
:
add --signed-tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
t/test-lib
.
sh: fix TRASH_DIRECTO
R
Y h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
m
e
rge-tree: don't
print en
t
ri
e
s t
h
at match
"
local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Jo
h
n Keep
i
ng
gitremote-helpers
(
1): clari
f
y refspec
b
eh
a
viour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
sub
m
odule
:
print
g
raph
o
utput next t
o
submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn
K
eeping
diff: allow unstuck argume
n
ts with --
d
iff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keepin
g
g
i
t
-
me
r
ge(
1
):
d
o
cument diff-a
l
gorithm option to me
r
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eeping
bisect: avoid sig
n
e
d integ
e
r overflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
Keeping
d
i
f
f
cor
e
-break: don't divide
b
y zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800: run --di
r
-di
f
f tests
with and
w
i
thout sym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Ke
e
ping
t7800: fix tes
t
s whe
n
d
i
f
ftool uses --no-sym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t78
0
0: don't hide gre
p
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
difftool: don
'
t overw
r
ite
modifi
e
d file
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00: mo
v
e '--symlin
k
s' specif
i
c
t
est
to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn Keeping
m
e
r
g
e-
t
r
e
e: fix typo
in merge-tree
.
c::unresolv
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix f
r
ead error handli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n Keep
i
ng
entry: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eep
i
n
g
t
2
0
03: mod
e
r
n
i
ze st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool -
-
dir-dif
f
: sy
m
l
ink all files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
dif
f
tool: avo
i
d dou
b
le slashes in symlink ta
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
pin
g
git-difftool(1):
f
ix formatting of
--
s
yml
i
nk description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c: mark priv
a
te file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Make
f
ile: make
m
andir,
htmldir an
d
infodir
a
bsolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebas
e
-i:
r
es
p
ect core
.
commentch
a
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
c
ombine-di
f
f
.
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
Jo
h
n
Keeping
diff
.
c: us
e
diff_line_prefix() where a
p
p
licable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
diff:
add diff_line_pref
i
x
funct
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
d
i
ff
.
c
:
ma
k
e
c
on
s
tant string a
r
guments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff:
w
ri
t
e prefix to the corr
e
ct
f
ile
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
gra
p
h
: output
padding for merge sub
s
e
quent p
a
rent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
Jo
h
n Keeping
t403
8
: ad
d
tests f
o
r "diff -
-
cc --raw <tre
e
s
>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Keeping
bui
l
tin/apply:
tighten (dis)similarity
ind
e
x parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
mergetool--lib:
list user configured to
o
ls in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John K
e
epin
g
Re
n
ame
{git- =>
git}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Joh
n
Keeping
Cod
i
ngGuide
l
i
nes: add P
y
tho
n
coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n K
e
eping
git
-
remot
e
-testp
y
: fix path hashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
merget
o
ol-
-
lib: d
o
n't call "exit"
i
n setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
g
it-difftool: use git-mergetool--li
b
for "--too
l
-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
gi
t
-
m
ergetool: don't har
d
code 'me
r
ge
t
o
o
l' in show_too
l
_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
gi
t
-merg
e
tool
:
remove re
d
u
n
dan
t
assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-m
e
r
g
e
t
ool: move s
h
ow_t
o
ol_help to mergetoo
l
--
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next