repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'tr/gitk-doc-range-trace'
2014-01-17
John
Ke
e
ping
p
ull: s
u
ppr
e
ss error when
no remoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keepi
n
g
comp
l
etio
n
: handle --[
n
o
-
]
fork-poi
n
t
options to gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
o
hn
Ke
e
ping
comple
t
ion
:
com
p
lete me
r
ge-base opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keepi
n
g
re
b
ase: fix
f
o
r
k-point with
z
ero
arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
reb
a
se: u
s
e
reflog to fin
d
common base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Ke
e
pi
n
g
p
u
ll: use merge-base
--fork-point
w
hen
a
ppropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
p
e
ek
-
remote:
remove deprec
a
t
e
d a
l
ias
o
f l
s
-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
l
ost-found: r
e
mov
e
dep
r
ecated
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Kee
p
ing
t
a
r-tree: remove de
p
r
eca
t
ed comman
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
eeping
repo-config: remove deprecated alias for "git co
n
fi
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
o
hn
K
e
epi
n
g
D
ocu
m
entation/Makefil
e
: make AsciiDoc db
l
atex dir
c
onfig
u
rable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-recursive: fix pars
i
ng of "diff-a
l
gorithm" optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
oh
n
Keeping
re
s
e
t: handle submodule with trailing sla
s
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
Keeping
rm:
re-use par
s
e_path
s
pe
c
's trailing-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
K
eep
i
ng
g
i
t_remote_helpers:
remove l
i
ttl
e
used Python librar
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
re
v
-parse(
1
): logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn K
e
eping
rev-p
a
rse: remo
v
e
r
estrictions on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
Jo
h
n Keep
i
ng
pull:
c
hange the des
c
ription
to
"
integr
a
te" change
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
Keeping
p
u
sh: avoi
d
sugges
t
ing
"
m
erging" r
e
mote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn Keepin
g
git-config(1): clarify precedence of m
u
ltiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Kee
p
ing
g
i
t-c
o
n
f
ig: update doc fo
r
--get with
multiple
v
alues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Keeping
comp
l
e
tion: lea
r
n about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
h
n Ke
e
ping
completion: h
a
ndle unstu
c
k
form of
b
a
s
e git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: allow movi
n
g the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
ast-import: allo
w
ls or filecopy
of the
root
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n Keep
i
ng
f
ast-imp
o
rt:
set valid mode
o
n
root tree i
n
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
t9300: d
o
c
um
e
nt fast-
i
m
p
ort
e
mpty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
submodule
:
dro
p
the
top-lev
e
l requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
p
ing
rev-parse: add -
-
pr
e
fix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: show full path in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
t
7403:
a
dd missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7
4
0
3:
m
oderniz
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keepin
g
t7
4
0
1: make i
n
dentatio
n
consis
t
en
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
e
p
ing
mergetoo
l
--lib:
refa
c
tor {dif
f
,merge}_
c
md
logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Kee
p
ing
Documentation/Makefile: move infodir to be wit
h
o
t
her
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
epi
n
g
Docume
n
t
a
tion/Makefile: fi
x
spaces around ass
i
gnments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Joh
n
Keeping
add--interactive
:
respect dif
f
.
alg
o
rit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Jo
h
n K
e
eping
git
-
g
u
i: fix file name handling with non-empt
y
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John K
e
eping
fetch: don't try to updat
e
u
n
fetc
h
ed tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keepi
n
g
d
i
fftool:
f
ix 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
mer
g
e
-
tree: handle
d
irectory/
e
m
p
ty co
n
flict
c
o
r
rectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
J
o
hn Ke
e
ping
t/Make
f
ile: don't define TEST_RESULTS_DIRECTOR
Y
recursi
v
ely
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
Keepin
g
co
n
trib/
s
ubtree
:
don't delete remo
t
e b
r
anches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keep
i
ng
t
e
st output
:
respect $TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/M
a
kefi
l
e: rem
o
ve smoke
test
ta
r
g
et
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
K
e
eping
m
erge
-
tree: fix typo in "
b
oth changed
i
dentical
l
y"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
ohn Keeping
t/
M
a
k
e
file: fix result hand
l
ing with TEST
_
OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
tr
a
n
s
p
o
rt-he
l
per: add
'
signed-tags' capabi
l
ity
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
r
ansport
-
helper: pass
-
-signed-tags
=
w
a
rn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n
Keeping
f
a
st
-
expo
r
t: a
d
d --signed-ta
g
s=
w
arn-strip
m
ode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
t/test-lib
.
s
h: fix TRASH_DIRECTO
R
Y han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
Keepin
g
m
erge-tree
:
don't
print entries
t
hat ma
t
ch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
git
r
emote-helpers(1): clarify refspe
c
behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
oh
n
Keep
i
n
g
subm
o
dule: print g
r
a
ph
o
u
tput next to submodule l
o
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff
:
allow unstuck arguments
with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Kee
p
ing
git-merge(1
)
: document dif
f
-
a
lgorith
m
optio
n
to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
eping
bisect: avoid signed inte
g
er
o
verflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn K
e
eping
diffcor
e
-break:
d
o
n't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run --dir-diff tests with and withou
t
symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7800:
f
i
x tests when difftoo
l
u
s
es --no
-
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t7800: d
o
n't hi
d
e
grep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool: don't overwrite m
o
di
f
ied files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn K
e
epin
g
t7800: mo
v
e '--symlink
s
' specific test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Joh
n
K
eeping
merge-tree: fix typo in merg
e
-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Joh
n
Keep
i
ng
refs
.
c: fix frea
d
error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix fi
l
te
r
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
t2003:
m
o
d
erni
z
e style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keep
i
ng
difftool --dir-diff: symlink all
fi
l
e
s
matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: avoid dou
b
le sla
s
he
s
in
s
ym
l
ink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1): fix for
m
atting o
f
--symlink des
c
ription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Rev
e
rt
"
graph
.
c: mark
p
riva
t
e file-sco
p
e
sy
m
bols
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
h
n Keeping
M
a
kefile: mak
e
mandir, htmldir a
n
d infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
eping
reb
a
se
-i
:
respect core
.
comm
e
ntchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
eping
combine-diff
.
c: teach combine
d
d
i
ffs abo
u
t
l
ine pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keep
i
ng
dif
f
.
c: use diff
_
line_prefix()
w
here applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
di
f
f: add diff_line_prefix
f
uncti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eepin
g
diff
.
c
:
make constant
s
tring arg
u
m
ents con
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keep
i
n
g
d
iff: wr
i
te prefix to the corr
e
ct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
K
e
ep
i
ng
g
r
aph: outp
u
t padding f
o
r merge s
u
bs
e
qu
e
nt parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
K
eeping
t
4
038: add t
e
sts for "diff -
-
cc --ra
w
<tr
e
es>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keep
i
n
g
buil
t
in/app
l
y: tighten (dis)similarity index par
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn K
e
epi
n
g
m
e
rg
e
t
o
ol--lib: lis
t
user configured to
o
ls
i
n '-
-
t
o
ol
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
e
name {git- => git}r
e
mote-helpers
.
tx
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
ohn Keeping
Coding
G
u
i
delines: add Python
cod
i
ng g
u
id
e
l
i
nes
commit
|
commitdiff
|
tree
2013-01-28
John
K
e
eping
git-remote-testpy: fix path hashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
n
g
m
ergetool--lib: don't call "exit" in set
u
p_too
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git-difftool: us
e
gi
t
-mer
g
etool--lib for "
-
-tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t
-
mergetool:
don't
h
ardcode 'mergetool' in sh
o
w
_tool_
h
elp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
g
i
t
-mergetool: re
m
ove redunda
n
t assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-m
e
rget
o
o
l: move
show_tool_help to m
e
r
g
etool
-
-
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-remot
e
-testpy: c
a
ll print as a
functio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keep
i
ng
git
-
remote-test
p
y:
don't do unbuffe
r
ed
t
ext I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Keeping
git-r
e
mot
e
-testp
y
: ha
s
h bytes ex
p
li
c
itl
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
svn-fe: allow svnr
d
u
mp_sim
.
py to run with P
y
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
g
i
t_remote_helper
s
: use
2to3 if build
i
n
g
with Pyth
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keepin
g
git_remo
t
e_hel
p
er
s
: for
c
e rebuild if
p
y
t
hon
version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Joh
n
Keeping
git-c
v
simp
o
rt
.
txt: c
v
sps-2 i
s
depre
c
at
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Kee
p
ing
g
it-for-each-
r
e
f
.
txt: 'raw
'
is a
support
e
d date
f
o
rmat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote_hel
p
ers
:
fix input w
h
e
n
runni
n
g und
e
r Pyth
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n
K
eeping
git
_
r
emote_he
l
per
s
: al
l
ow b
u
ilding with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next