repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.9-rc2
2014-01-27
John Ke
e
ping
Makefile
:
rem
o
ve re
d
undan
t
ob
j
ect in git-http{
f
et
c
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Kee
p
ing
p
ull:
s
uppress error wh
e
n n
o
r
e
moteref
i
s found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
e
ep
i
ng
completio
n
: handle
--[no
-
]for
k
-
poin
t
opt
i
ons to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
Keeping
completi
o
n: complete merge-base o
p
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebase: fix fork-point with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebase: use reflog to find common base w
i
t
h
upstrea
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
o
hn
K
eeping
pull: use m
e
rge-base --fork
-
point
when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek-remote:
rem
o
v
e
deprecate
d
alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
lost-found: rem
o
ve
deprecated comman
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
n
g
t
a
r-tree: remove deprecated
co
m
ma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
pi
n
g
re
p
o
-
c
onfig: remove depre
c
ated alias
f
or "git conf
i
g"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
Keep
i
ng
D
o
c
um
e
n
tation/Makefile
:
ma
k
e As
c
iiDoc dbl
a
t
e
x dir con
f
igurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
Keeping
m
erge-recursive
:
f
i
x parsing of "diff-al
g
o
rithm" o
p
ti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Ke
e
ping
reset: handle submodule wit
h
trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-use parse_
p
a
t
hspec's trail
i
ng-slash
r
emov
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
Keeping
git_r
e
mote_
h
elpers: remove little
used Python li
b
r
ary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-p
a
rse
(
1): logically gr
o
up
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
ping
rev-par
s
e: remove res
t
r
ic
t
ion
s
on
so
m
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Kee
p
ing
pu
l
l:
c
hange the description
to "i
n
t
e
grate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
ohn Kee
p
ing
pus
h
: avoid suggesting "
m
erging
"
r
emote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
g
i
t
-co
n
fig(1):
clarify prec
e
dence
o
f multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Jo
h
n Keeping
g
it-confi
g
: update doc
f
or --get with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Joh
n
Keeping
c
o
m
plet
i
on: learn about --m
a
n-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Ke
e
p
i
ng
compl
e
tion
:
handle unstuck form of base git opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
f
a
st-import: allow moving
the root
t
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
f
a
s
t-import: all
o
w
l
s or fi
l
ec
o
py of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keeping
f
as
t
-import: set v
a
lid mode on root
tr
e
e in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
t9300:
document fast-im
p
or
t
empty
path i
s
sues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keepi
n
g
submodule: dro
p
the top-level require
m
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
rev-parse: add --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
u
bmodule: s
h
ow f
u
ll path in erro
r
m
e
ssage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
n
g
t7403: a
d
d
m
iss
i
ng
&& chai
n
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
t
7
403: mode
r
nize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
t
7
401: make indentatio
n
con
s
istent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool--l
i
b: ref
a
cto
r
{diff,merg
e
}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n
Ke
e
ping
Do
c
u
mentat
i
on/Makefile: move inf
o
dir
to be wi
t
h other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
Documentation/Makefile: fix spac
e
s around assi
g
nments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John
Ke
e
ping
ad
d
--intera
c
tive: r
e
spect diff
.
a
lgorit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gui: fix f
i
le name handling wi
t
h non-
e
mpty p
r
ef
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
ohn Keeping
fetch: don'
t
try
to
update unfetched tracking re
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
d
iff
t
ool: fix dir-diff when
f
i
l
e
does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree:
h
a
nd
l
e direc
t
or
y
/empty conflict correc
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t
/
Makefile: don't define TEST_RESUL
T
S_D
I
RECTORY recursiv
e
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
o
h
n Keepi
n
g
contrib
/
subtree
:
don't del
e
te r
e
mote
b
r
anches if spl
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keepin
g
test output: r
e
spect $TEST_OU
T
PUT_DIREC
T
ORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keeping
t/Makefile: re
m
ove
smoke test target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keep
i
ng
merge-
t
ree: fi
x
typo
i
n "
b
oth changed iden
t
ic
a
lly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Jo
h
n
Keeping
t/M
a
k
e
file: fix r
e
sul
t
hand
l
ing with TEST
_
OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Ke
e
pi
n
g
t
ransport-help
e
r: a
d
d
'signed-tags' capabi
l
ity
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
transport-helper: pass --s
i
gned-ta
g
s
=
warn
-
strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fa
s
t-expo
r
t
:
add --sig
n
ed-tags=warn-
s
trip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-li
b
.
sh: f
i
x TRASH_DIREC
T
ORY handli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
me
r
ge-
t
re
e
: don't print en
t
ries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
hn Ke
e
ping
gitremote-helpers(1
)
:
c
larify
re
f
spec beha
v
iour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: print grap
h
o
utput next to su
b
module log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepi
n
g
d
iff:
a
ll
o
w unstuck arguments with
-
-diff-a
l
gorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepi
n
g
git-merge(1): docum
e
nt
d
iff
-
algorithm option to me
r
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
bi
s
ect:
avoid si
g
ned integer o
v
erflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
eping
diffcore-break: don't di
v
ide by
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
r
un
-
-d
i
r-diff tests with a
n
d without
s
ym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7
8
00: fix tests when
d
ifft
o
o
l uses --no-symli
n
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keepin
g
t
7800: don't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
dif
f
tool: do
n
't overw
r
ite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Kee
p
in
g
t780
0
:
move '--s
y
m
links'
specific te
s
t to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Kee
p
in
g
me
r
ge-tre
e
:
fix typo in merge-tree
.
c::unres
o
lved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Joh
n
Keepi
n
g
re
f
s
.
c: fix f
r
e
a
d
error handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
entry: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Ke
e
pin
g
t2003: modernize
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
e
p
ing
d
i
f
f
tool
-
-d
i
r-diff: symlink all
f
i
les matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
in
g
difftool: avoid
d
ouble slas
h
es in sym
l
i
n
k targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
git-difftool(1
)
:
fix formatti
n
g o
f
--sy
m
link
d
escription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
K
eeping
Rever
t
"gra
p
h
.
c
: mark
pri
v
ate
f
il
e
-s
c
ope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keep
i
ng
M
a
kefile:
ma
k
e mandir, htmld
i
r and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
rebas
e
-i:
r
espec
t
core
.
comm
e
ntchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
combi
n
e-
d
iff
.
c
: teach combined dif
f
s a
b
out line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: us
e
dif
f
_line
_
p
refix() where applic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add diff_line_pre
f
ix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
diff
.
c: make cons
t
ant str
i
ng argum
e
nt
s
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
:
write p
r
efix to the corr
e
ct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn Keepin
g
graph: output padding for mer
g
e subsequen
t
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
Jo
h
n Keeping
t4038: add t
e
sts f
o
r "diff --cc
-
-
r
a
w <tree
s
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
b
u
iltin/apply:
ti
g
hte
n
(dis)
s
imi
l
arit
y
index p
a
r
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keepin
g
mergetool
-
-lib: l
i
s
t
u
ser
c
onfigured
tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn Keeping
Rename {git-
=> git}remote-hel
p
ers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn Keeping
CodingGuideli
n
es:
add
Python coding
g
uideline
s
commit
|
commitdiff
|
tree
2013-01-28
John Keepin
g
git-remote-testpy: fix path
hashing
o
n Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
ping
mergetool--lib: don't call "exit" i
n
se
t
up_to
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn K
e
ep
i
n
g
git-difftool:
use git
-
mergetool
-
-lib for "--tool-he
l
p
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keepi
n
g
git-mergetool:
don't
h
ar
d
code 'mergeto
o
l' i
n
show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Ke
e
p
ing
git
-
mergetool: remove redun
d
ant assig
n
ment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: mov
e
show_tool_help to m
e
rg
e
tool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remo
t
e
-
testpy: call pr
i
nt as a f
u
nct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Ke
e
ping
git-remote-tes
t
py
:
don't do unbuf
f
ered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-re
m
ote-t
e
stpy: hash
bytes exp
l
icitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
s
v
n-fe:
a
llow svnrdump_sim
.
py to
run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it_
r
emote_helpers: use 2to3 if bu
i
lding with Pyth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_helper
s
: forc
e
rebuild if
python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
o
hn K
e
eping
git-cv
s
i
m
port
.
tx
t
:
c
v
sps-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
g
i
t-for-each-ref
.
txt: 'raw' is
a
s
upported date forma
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Joh
n
Keeping
git_remote_
h
elpe
r
s
:
fix
i
nput when running under P
y
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next