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 tag 'v1.9-rc1' into debian-sid
2014-01-27
John K
e
eping
Makef
i
le
:
r
emove redundant object
i
n git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keepi
n
g
pull: s
u
ppress
e
rror when no
remot
e
ref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
o
hn Kee
p
i
n
g
comp
l
etion: handle --[no-]fork-point
opt
i
ons to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John K
e
e
pi
n
g
completion: complet
e
merge-base option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Ke
e
pi
n
g
r
e
base:
f
ix fork-po
i
nt with zero argum
e
nt
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebase: us
e
ref
l
og
t
o find
common base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John K
e
e
ping
pull: use merge-base --fork
-
point when appr
o
pr
i
ate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek
-
remote: re
m
ove
dep
r
eca
t
ed
alias of
l
s-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
K
e
eping
lost-fou
n
d
:
remove
depre
c
ated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tree: remove
d
epr
e
c
ated comman
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
repo-
c
onfig: remove
de
p
recated alias for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Joh
n
Keepi
n
g
Documentation/Makefile:
make A
s
ci
i
Doc dblate
x
dir conf
i
gu
r
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
K
eeping
merg
e
-recursive:
fi
x
p
a
r
s
ing
of "
d
iff-
a
lgori
t
hm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset: handle submodule w
i
th t
r
ailing s
l
ash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
Keeping
rm: re-use
p
ars
e
_paths
p
ec's tr
a
iling-sl
a
sh remov
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n K
e
eping
git_
r
emote_helpers: remov
e
lit
t
le
u
sed Py
t
hon
l
ibra
r
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn Ke
e
pi
n
g
rev-p
a
rse(
1
): lo
g
icall
y
group
option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse:
re
m
ove
restrict
i
ons o
n
some o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
p
u
ll
:
c
hange the description to "integrate" ch
a
nges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avoid suggesti
n
g "
m
e
rging" remo
t
e changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
K
e
eping
git-config(1): clari
f
y precedence of mul
t
i
p
le
v
a
lues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John
Keeping
git-config: update doc for --get with m
u
ltiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n K
e
eping
completion: learn about
-
-man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
Ke
e
pi
n
g
comp
l
etion:
h
andle
u
nstuck form of base git optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keepin
g
f
a
st
-
im
p
ort: allow moving
the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
f
a
st-import: allow ls or filec
o
py
o
f the
r
oot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
f
a
st-imp
o
rt: set v
a
lid mode on
root tree
i
n "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
n
g
t9300: docum
e
n
t
fast-im
p
ort empty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn K
e
epin
g
su
b
module: drop the
top-l
e
vel r
e
quirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
rev-
p
arse: add --pr
e
f
i
x o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
submodule: show full path in
error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add missing
&
& chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n
K
eepi
n
g
t7403: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: make indentation consiste
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool-
-
lib: refactor {diff,merge}_cmd l
o
gic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keepi
n
g
Do
c
umentation/Make
f
ile: mo
v
e
inf
o
dir to b
e
wi
t
h
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
Documentation/Makefile: fix spaces aro
u
nd assign
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
epin
g
add--interactive: respect diff
.
al
g
orithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Joh
n
Keeping
git
-
gui: fix file n
a
me handl
i
ng
with non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Ke
e
ping
fetch: don
'
t try
t
o
u
p
d
ate unfetched tracking ref
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftoo
l
: fix
d
i
r
-dif
f
w
h
en file
do
e
s not exist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-
t
ree: han
d
le d
i
r
e
ctory/empty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John K
e
eping
t
/Mak
e
file: don'
t
define TES
T
_RESU
L
TS_D
I
RECTORY
r
ecur
s
i
vely
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib/subtre
e
: don't delete remote branches if
s
plit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
o
hn Keep
i
n
g
test output:
r
espect $TE
S
T_OUTPUT_DIR
E
CTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
t/Makefile:
r
emove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keepi
n
g
merge-tree: fix
typ
o
in
"bo
t
h changed i
d
e
nt
i
c
a
l
l
y"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Jo
h
n Keeping
t/Ma
k
e
file: fix resul
t
handling with TEST_OUTPUT_DI
R
ECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keepin
g
transp
o
rt-helper: add 'signed-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tr
a
nsport-help
e
r: pass --signed-tags=warn
-
strip
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
i
ng
fas
t
-expor
t
:
add --sig
n
ed-tags
=
warn-strip
m
o
d
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
t/tes
t
-lib
.
sh: fix
T
RASH_DIRECTORY h
a
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge
-
tree: don't print
entr
i
es
that matc
h
"
l
ocal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremot
e
-
h
elpers(1):
clarify refspec
b
ehaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Kee
p
ing
submodul
e
:
p
r
i
n
t g
r
aph outp
u
t next to submodule
l
og
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
K
eepi
n
g
di
f
f: allo
w
unst
u
ck argum
e
nts
with --
d
iff-algor
i
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keeping
g
it-merge(1): docu
m
ent di
f
f-algorithm option to
m
e
rge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keepin
g
bisect:
a
void signed integer o
v
erflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcor
e
-
break: don't divide b
y
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7800: run --dir-d
i
ff tests with
and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800: fix t
e
sts when
difftool uses
-
-n
o
-s
y
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800: don't
h
ide grep
o
u
t
put
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Kee
p
ing
difft
o
ol: do
n
't overwrite
modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7800: mo
v
e
'--symlin
k
s
'
specific test to
t
he e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
Keeping
m
er
g
e-tree: f
i
x
typo
i
n
m
er
g
e-t
r
ee
.
c::
u
nresolv
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Joh
n
Keeping
ref
s
.
c: fix fread error hand
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
K
e
ep
i
ng
entr
y
: f
i
x
fi
l
ter loo
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
t
2
003: modernize
styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
d
iff
t
o
o
l --di
r
-diff
:
symlink
a
ll fi
l
es
m
atching
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: avoid dou
b
le
s
lashes in
symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1): fix formatting of --symli
n
k description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keepi
n
g
Revert "gr
a
ph
.
c
: ma
r
k private file-scope s
y
m
b
o
l
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keepi
n
g
Mak
e
file: make
mandir, htmldir an
d
infodir a
b
s
olute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebas
e
-i
:
r
esp
e
ct core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
c
o
mbine-
d
iff
.
c: teach combined diffs about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
d
i
ff
.
c: use
diff_line_pre
f
ix
(
) where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: a
d
d diff_lin
e
_
pr
e
fix
f
uncti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
ff
.
c
:
make constant st
r
ing argument
s
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff
:
wri
t
e pr
e
fix
t
o
the c
o
rrect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
gr
a
ph: out
p
ut
p
adding f
o
r
mer
g
e sub
s
e
quent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
K
ee
p
ing
t4038: ad
d
tests fo
r
"di
f
f --cc --raw
<trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin
/
apply:
tighten (dis)si
m
ilarity index p
a
rsin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keepin
g
mergetoo
l
--lib: li
s
t user configu
r
ed tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git
-
=> git}remote-helper
s
.
t
x
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn Keeping
CodingGuideline
s
: ad
d
P
y
thon codi
n
g
g
uid
e
lines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remo
t
e-testpy: fi
x
p
ath h
a
shing on
Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
ng
mergetool
-
-
l
i
b: don't ca
l
l
"exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-diff
t
ool: use
gi
t
-merget
o
ol--l
i
b for "--to
o
l
-h
e
lp
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
g
i
t
-merget
o
ol:
don't hardco
d
e
'
merge
t
ool' in show_too
l
_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-mer
g
e
tool:
remove r
e
d
u
ndant assignme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eepin
g
git
-
mergetool:
m
ove sho
w
_tool_help to
m
erg
e
t
ool--l
i
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-remote-
t
e
stpy:
c
all print as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-testpy:
d
on't do unbu
f
fered
text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-remote-testpy: hash bytes
expli
c
i
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
svn-fe: allow svnrdump_si
m
.
py to r
u
n
w
ith Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_
h
el
p
ers: use
2to3 if bu
i
lding
w
i
t
h Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git_remote_helpers:
force
re
b
uild if python ve
r
sion
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keepi
n
g
git
-
cvsimport
.
t
x
t: cvsps-2 is
d
eprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Kee
p
i
n
g
git-for-ea
c
h-r
e
f
.
tx
t
:
'raw' is a supported d
a
te
form
a
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remo
t
e_helpers: fix input when running und
e
r P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next