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-rc1
2014-01-27
J
o
hn Keeping
Makefile: r
e
move redundant object in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Kee
p
ing
pu
l
l: su
p
press erro
r
when no remo
t
eref is
f
oun
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
Keepin
g
complet
i
on: handle
--[
n
o-]fork-point options t
o
gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
co
m
p
l
etion: co
m
plet
e
m
erge-base option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
o
hn Keep
i
ng
re
b
ase: fix f
o
r
k
-point
w
i
th
z
ero argume
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keepin
g
reb
a
se: use r
e
flog to f
i
nd com
m
on base with
upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John
K
e
eping
pull: use merge-b
a
se --fork-point when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
oh
n
Keep
i
ng
peek-remote: remove depr
e
cated
alias o
f
ls-
r
emote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n K
e
eping
lost-f
o
und:
remove de
p
r
ecated com
m
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
e
ping
tar
-
t
ree: remove depre
c
at
e
d com
m
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Ke
e
ping
repo-config:
r
emove deprecated alias for "gi
t
config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
ohn Keeping
Documentation/
M
akefil
e
: make AsciiDoc dbla
t
ex dir
configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
Joh
n
Keeping
merge-recursive: fix parsing of "diff-algorithm
"
o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
ohn Keepin
g
r
eset: handl
e
submodule
w
ith traili
n
g
sl
a
sh
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: r
e
-
u
se parse_pat
h
spec's tr
a
iling-s
l
ash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keepin
g
git_
r
e
mote_
h
elp
e
rs:
r
e
move
little used Python libra
r
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn Keeping
rev-parse(1): lo
g
ically group opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
K
e
e
p
ing
rev-
p
arse: remove restrictions o
n
some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John
K
eeping
pull:
c
hange the
d
escriptio
n
t
o "i
n
tegr
a
te"
c
han
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avo
i
d suggestin
g
"merging
"
re
m
o
t
e changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
git-config(1): cla
r
ify prec
e
de
n
ce of multipl
e
v
a
l
u
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
ohn Keeping
git-con
f
ig: update doc
for
-
-get with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
c
o
mp
l
etion: learn about -
-
man-pa
t
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keepin
g
comple
t
i
o
n: handle
u
nstuck
for
m
of base
g
it opt
i
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keep
i
ng
fast-import:
allow moving the
r
oot
t
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keepin
g
fast-im
p
ort: allow ls or filecopy o
f
the root
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepi
n
g
f
ast-import:
set val
i
d mode
o
n
ro
o
t tr
e
e in "
l
s"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
t9300:
d
ocument fast-import empty path issue
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: drop the top
-
level requireme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
r
ev-parse:
a
d
d --prefix opt
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
su
b
m
o
du
l
e: show full path in err
o
r
m
essage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add missing
&
&
c
haining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
t7403: mo
d
ernize
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7
4
01: make i
n
dentation consist
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keepi
n
g
mer
g
etool--lib: r
e
facto
r
{diff,mer
g
e}_cm
d
logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
D
o
cum
e
n
t
a
t
ion/Makefile: move inf
o
dir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
D
o
cume
n
tation/Makefi
l
e: fi
x
spaces arou
n
d assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
hn Keep
i
ng
add--interactive: respec
t
diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Kee
p
ing
g
it-gui:
f
ix file name handling with non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
Jo
h
n Keep
i
ng
fetc
h
:
d
on't try t
o
up
d
ate unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
diff
t
ool
:
fix dir-diff
w
hen file does n
o
t ex
i
st
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Joh
n
Keeping
me
r
ge-tree: handle
directory/em
p
t
y
conflict c
o
rrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
J
oh
n
Ke
e
ping
t/Mak
e
f
i
le: don't define TEST_RESULTS_DI
R
ECTO
R
Y r
e
cursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
c
ontrib/subtree: don't delete remote branch
e
s
if
s
p
lit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
K
eeping
te
s
t
outp
u
t: respect $TEST_O
U
TPUT_DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t
/
Make
f
il
e
:
r
emove smok
e
test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
epi
n
g
me
r
ge-t
r
ee: fix
t
ypo
i
n "b
o
th changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile:
fix resul
t
han
d
lin
g
with TEST_
O
UTPUT_DI
R
ECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tran
s
port-
h
e
lper: a
d
d 'signed-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
transport-h
e
lper: pass -
-
signed-
t
ags=warn-strip t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
fast-
e
xport: add --sig
n
e
d-tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn
Keeping
t
/
test-l
i
b
.
s
h
: fix TRASH_DIRECTO
R
Y handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: do
n
't print entri
e
s that match "
l
ocal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote-helpers(1): clarify re
f
spec
b
ehaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn K
e
epi
n
g
submo
d
u
l
e: print graph out
p
ut next to subm
o
dule lo
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn
K
ee
p
ing
d
i
ff: allow
unstuck arguments with --diff
-
algor
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
p
ing
git-merge(1):
d
ocument diff-
a
l
gori
t
hm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bise
c
t: av
o
id signed integer overf
l
ow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
diffcore-break: don't divi
d
e by zer
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
e
ping
t7800: run --dir-d
i
f
f
tests with and w
i
tho
u
t symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00: fi
x
tests when difftool uses --no-sy
m
li
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t780
0
: don't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
d
i
fftool: don
'
t
overwri
t
e
modifie
d
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keepin
g
t7800
:
move '--symlinks
'
specific test to t
h
e
en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tree:
f
ix
typo
i
n me
r
ge-tree
.
c:
:
u
nresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
hn Ke
e
ping
r
efs
.
c:
f
ix fre
a
d erro
r
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
K
e
eping
entry: fix filter loo
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Kee
p
i
ng
t2003: modernize st
y
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
diff
t
ool --dir-diff: symlink all
f
iles m
a
tching
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
difftool: avoid
doub
l
e sla
s
hes in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
pi
n
g
git-difftool(1): fix fo
r
matting o
f
--symlink descripti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
R
ever
t
"graph
.
c: mark priv
a
te file-s
c
ope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefi
l
e: make man
d
ir, htmldir an
d
infodir a
b
solut
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
r
eba
s
e
-
i:
r
espect c
o
re
.
comme
n
tchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
K
eeping
combine-diff
.
c: teach comb
i
ne
d
d
i
f
fs a
b
out line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff
.
c: us
e
di
f
f
_
line_prefix
(
) where a
p
plicabl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
i
ng
d
iff: add diff_line_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff
.
c: m
a
ke co
n
stant str
i
ng argume
n
ts co
n
st
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
d
i
ff: write pr
e
fix
to the
c
orrect fi
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
eping
g
r
aph
:
output p
a
d
d
ing f
o
r mer
g
e subsequent
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add
t
ests for
"
di
f
f --cc --raw <tre
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
ping
builtin/a
p
ply: tight
e
n (dis)simil
a
rity index par
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
m
ergetool--lib:
list user configured
t
ools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Keeping
Rename {gi
t
- => gi
t
}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn
K
eeping
Coding
G
u
ide
l
ines: add Python c
o
ding gui
d
elines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remot
e
-te
s
t
py
:
fix pa
t
h
hashing on Pyth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
ng
m
e
r
g
et
o
o
l
-
-
l
ib: don'
t
cal
l
"exit" in setup_
t
ool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-difft
o
ol:
u
se git-merg
e
tool--li
b
for "--
t
ool-h
e
lp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-merget
o
ol: don't hardcode
'merget
o
ol' in show
_
tool_
h
elp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eepin
g
git-merge
t
ool: remove redunda
n
t assignme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
g
i
t-mergetool: move
s
how_
t
ool_help to mergeto
o
l
--li
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
e
p
ing
git
-
remote
-
t
e
stpy: call print as a fu
n
c
ti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keep
i
ng
git-remot
e
-t
e
stpy: don'
t
do u
n
b
uffer
e
d text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
gi
t
-r
e
mote-testpy: h
a
sh bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe:
allow s
v
nrdump_sim
.
py
to r
u
n wit
h
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eepi
n
g
git_remote_helpers: use 2to3
i
f b
u
ilding with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git_remote_help
e
rs
:
fo
r
ce rebuild if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
g
it-cvs
i
m
port
.
txt: cvsps-2 is dep
r
ecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Jo
h
n Keeping
git-for-each-ref
.
txt: '
r
aw' i
s
a sup
p
orte
d
date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Keeping
git_remote_helpers: fix input when running
under Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next