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 'mm/status-porcelain-format-i18n-fix' into maint
2014-03-11
J
o
hn Keepi
n
g
builtin/mv: fix out
o
f bo
u
n
d
s write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John
K
eepi
n
g
Makefile: remove redunda
n
t o
b
jec
t
in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
o
hn Keepi
n
g
pull: s
u
p
p
ress error w
h
en
no
r
e
m
o
teref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keep
i
ng
completio
n
: handle --[no
-
]fo
r
k-point o
p
ti
o
ns to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn K
e
eping
comp
l
et
i
on: complete
merge-b
a
se opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebas
e
: fix fork-point with zero
a
r
g
uments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Ke
e
ping
rebase:
u
se
r
eflog to
find co
m
mon
b
ase with upstrea
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Joh
n
Keeping
pull: use
merge-base
-
-fork-point when appr
o
pr
i
a
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n
Keeping
peek
-
r
em
o
te: remove
depre
c
ated alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-found: remove d
e
p
r
e
c
a
ted command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
tar-tree: remo
v
e de
p
recat
e
d
comma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
repo-con
f
i
g
:
re
m
ove deprecated alias for "g
i
t conf
i
g"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Jo
h
n Keeping
Documentation/Makefile: make AsciiDoc
d
blatex dir configura
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John K
e
eping
mer
g
e-recursive:
fix p
a
rsing of "diff-algori
t
h
m" op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepin
g
reset: handle
s
u
b
mod
u
le with trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
oh
n
Keeping
r
m
:
re-us
e
par
s
e_pathspec
'
s trailing-slash
r
emova
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keepi
n
g
g
it_remote
_
h
e
l
pers: remove l
i
ttle use
d
Pyt
h
o
n library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
re
v
-pars
e
(1): lo
g
i
cally group
o
p
t
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John K
e
eping
rev-parse: remove re
s
trictions on some op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John K
e
epin
g
pull:
c
hange the description to "integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Kee
p
ing
push: avoid
suggestin
g
"merging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
ohn Ke
e
ping
git-conf
i
g(1)
:
c
larify preceden
c
e
o
f multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
oh
n
Keeping
git-config: upda
t
e doc f
o
r
-
-get with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
compl
e
tion: learn
a
b
o
u
t --m
a
n-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
com
p
l
e
tion
:
handle unstuck f
o
rm o
f
ba
s
e git
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast
-
import
:
allow moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Kee
p
ing
fast-im
p
ort: allow
l
s
o
r filecopy of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn
Keeping
fas
t
-i
m
po
r
t: set v
a
l
i
d mode
o
n r
o
ot tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
t9300:
d
ocum
e
nt
fast-
i
mp
o
r
t
e
mpty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: drop
t
he t
o
p-le
v
e
l
requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
r
e
v-parse:
add --
p
refix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
s
ubmodule: show full path in error
me
s
sage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7403: add missing &
&
cha
i
ning
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
t7403: moder
n
ize s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
in
g
t7401: make
i
nd
e
ntation consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Kee
p
ing
m
e
rgetool--
l
ib:
refactor {
d
iff,merge}_cm
d
l
ogic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Ke
e
ping
Docum
e
ntat
i
on
/
Ma
k
efile: mo
v
e in
f
odi
r
to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
Documenta
t
ion/Makefile: fix spaces around assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John
K
e
epin
g
add--in
t
eracti
v
e: r
e
sp
e
ct diff
.
alg
o
rit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Ke
e
p
ing
g
i
t-gui: fix file na
m
e hand
l
ing
w
ith no
n
-
empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Ke
e
p
i
n
g
f
etch: don't try to update unfetched tra
c
k
i
ng
r
e
fs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
ohn Keepin
g
difftool: fix dir-diff when
file does
not exist
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tr
e
e: ha
n
dle direc
t
ory/e
m
pty conflict
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keepin
g
t
/
Makef
i
le: don'
t
de
f
ine TEST_RESU
L
TS_
D
IRECTOR
Y
r
e
cursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
con
t
ri
b
/subtree: don
'
t
dele
t
e remote branches
i
f split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output: respect
$
TEST_OUT
P
UT_
D
IRECT
O
RY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
K
e
e
ping
t/Makefile: remove smoke tes
t
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tre
e
: fix typo in "both
c
hang
e
d iden
t
icall
y
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
ohn Keepi
n
g
t/Makefi
l
e: fi
x
res
u
lt
h
andling with TEST_OUTPUT_DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
transpor
t
-helper: add 'sig
n
ed-tags'
capabili
t
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
trans
p
ort-helper:
pass --signed-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Kee
p
i
ng
fast-export:
a
dd --
s
igned-tags=warn-
s
trip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n K
e
e
ping
t/test
-
li
b
.
sh
:
fix TR
A
SH_DIR
E
CTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eeping
merge-tree: don't print entries that
ma
t
ch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
h
n
Ke
e
ping
gitremote-
h
elpers(1): c
l
arify re
f
spec
behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
K
eeping
submod
u
le: p
r
int graph
o
utput
next to
su
b
module l
o
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Ke
e
ping
diff: allow un
s
tuck ar
g
ume
n
ts with
-
-diff-alg
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
ing
git-merge(1): document diff-algorithm option
t
o
m
e
rg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid si
g
ned i
n
teger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-bre
a
k: d
o
n't divide by
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800: r
u
n --dir
-
diff tests w
i
t
h
a
nd with
o
ut s
y
ml
i
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t
7800
:
fix tests when
d
i
f
ftool use
s
--no-symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t780
0
:
d
on't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
K
e
eping
diffto
o
l
: don't ove
r
write modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
move '--symlinks'
specific test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keep
i
ng
m
e
rge-
t
ree: fix t
y
po
in merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
eping
ref
s
.
c
:
fix fread er
r
or han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
Ke
e
pi
n
g
entry: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t
20
0
3: mod
e
r
n
ize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool
-
-dir
-
diff:
s
ymlin
k
all files matc
h
ing t
h
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
Keeping
difftool: a
v
oid dou
b
le slashes in sy
m
li
n
k targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keepin
g
git-difftool(1): fix formatting of
--symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Kee
p
ing
R
e
vert "g
r
aph
.
c:
m
ark
private file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
M
a
kefile: mak
e
mandir, htmldir and
i
n
fodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn
K
eeping
rebase
-
i: r
e
spec
t
co
r
e
.
comme
n
tchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combin
e
-
d
i
f
f
.
c
: teach
c
o
m
bined
d
i
ffs a
b
out line
pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
diff
.
c: use diff_line_pre
f
i
x
(
) where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff: add diff_lin
e
_pre
f
i
x function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
dif
f
.
c: make c
o
nstant
s
tring a
r
gume
n
ts c
o
nst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
diff: write pr
e
fix to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
gra
p
h: ou
t
put
p
a
dding for merge
s
ubsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn Keeping
t4038: add te
s
t
s for
"d
i
ff --c
c
--raw <trees>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply:
t
ight
e
n
(
d
i
s
)similarity i
n
d
e
x pars
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John K
e
eping
mergeto
o
l
-
-lib:
list user configu
r
ed t
o
ols i
n
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keep
i
n
g
R
e
nam
e
{git
-
=
> git
}
remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Codi
n
gGuidelines: add Python
coding gu
i
delines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
g
i
t-remot
e
-te
s
tpy
:
fix pa
t
h hashing on P
y
th
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keepi
n
g
mergetool--l
i
b
: don
'
t
c
all "exit"
i
n setup
_
tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
g
i
t-di
f
ftool: use
g
it-me
r
getool
-
-lib for
"--
t
o
ol
-
help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-
m
ergetool: don't hard
c
ode 'mergetool' in show_
t
o
o
l_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
g
it-mergetool: remove
red
u
ndant ass
i
gn
m
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mergetool:
move show_tool_
h
elp to
m
ergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-re
m
ote-test
p
y: ca
l
l
print a
s
a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
epi
n
g
git-remo
t
e
-
t
estpy: don
'
t
do unbu
f
fered
te
x
t I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Ke
e
ping
g
i
t-re
m
ote-t
e
stpy: h
a
sh byte
s
expli
c
itly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
s
vn-fe: allo
w
s
v
n
rd
u
mp_s
i
m
.
py t
o
ru
n
w
ith Pyth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
g
i
t
_remote_helpers: us
e
2to3 if bui
l
ding with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keepi
n
g
g
it_remo
t
e
_help
e
rs
:
force reb
u
ild if py
t
hon v
e
r
s
ion
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-cvsimport
.
t
x
t: cv
s
ps-2 is depre
c
at
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
g
it-for-each-ref
.
txt: 'raw' is a supp
o
rted
date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next