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
Merge branch 'fc/rev-parse-test-updates'
2013-09-09
John Kee
p
ing
git_remote_helper
s
: remo
v
e l
i
ttle used Python
l
i
brary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse(1): log
i
cally group
o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-par
s
e: r
e
move
r
es
t
rictions on
s
o
m
e optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull:
c
hange the d
e
scription t
o
"
integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
eping
push: avoid sugg
e
sting
"merging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn
Kee
p
i
ng
git-co
n
fig(1
)
:
cla
r
ify precedence
o
f
multiple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Kee
p
ing
git-config:
updat
e
doc
f
or
--get
w
ith mul
t
iple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Keeping
comp
l
etio
n
:
lea
r
n about --
m
an-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
K
eepin
g
comple
t
ion: handle unstuck form of base gi
t
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
fast-i
m
p
o
rt: allo
w
mov
i
n
g the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-
i
mport: allow ls or fil
e
co
p
y of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
fa
s
t-import: set valid m
o
d
e on
r
oo
t
tree in
"
ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
ng
t93
0
0: docume
n
t fast-impo
r
t
e
mpty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
u
b
m
o
dule: drop th
e
top-level requiremen
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-parse: a
d
d --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keeping
subm
o
dule: show ful
l
path in er
r
or
messag
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add missing
&
& ch
a
ining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
ee
p
ing
t740
3
: modernize sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
eping
t7
4
0
1
: make
i
n
d
e
nta
t
ion consi
s
tent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keep
i
ng
m
erge
t
ool--lib: refa
c
tor
{diff
,
merge}_cmd logi
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keepin
g
D
ocume
n
tat
i
o
n
/Makef
i
le: move info
d
ir
to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
Documentat
i
o
n/Makefile: fix spaces ar
o
und assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John
Keepi
n
g
a
d
d--interactive: respect diff
.
algor
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Jo
h
n Keep
i
n
g
git-gui: fix f
i
le name handling with non-empty
p
refi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetc
h
:
don
'
t try to update unfetched tra
c
king refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
d
i
fftool: fix dir-diff when
file
d
oes not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
ohn Keepi
n
g
merg
e
-
tree:
h
a
n
dle directory
/
empty conflict
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/M
a
kefil
e
: don
'
t define TEST_RESULTS_
D
IRECT
O
RY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
Keepi
n
g
c
o
ntrib/subtree:
don't delete remote
branc
h
e
s
if s
p
lit
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output
:
res
p
ect $TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Kee
p
ing
t/Makefile: remove
smoke test
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merg
e
-
t
r
ee: fix typo in "bot
h
ch
a
nged ide
n
t
ically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keepi
n
g
t
/Ma
k
efile: fix
result
handli
n
g
w
i
th
T
EST_OUT
P
UT_DIR
E
CTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
oh
n
Keeping
t
r
ansport-helper: add
'
si
g
ned-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
t
r
ansport-helper
:
p
a
ss --signed-tags
=
warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
f
ast-export: add
--signed-tags=warn-st
r
ip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/t
e
st-lib
.
sh: fix TRAS
H
_DIR
E
CTORY handli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John K
e
eping
m
erge-tree
:
don't pr
i
nt
e
nt
r
ies that
match "l
o
cal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Joh
n
Keeping
gitremote-helpers(1): clarif
y
refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keep
i
ng
submod
u
le:
p
rint graph out
p
u
t
next to s
u
bmodule
l
og
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
diff: allow unstu
c
k argument
s
wi
t
h
-
-
di
f
f-al
g
orith
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
i
t-m
e
r
g
e
(1): docu
m
ent diff-a
l
gorith
m
optio
n
t
o
me
r
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bi
s
ect: avoid signed integer
o
ve
r
flow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eeping
d
if
f
core-break:
don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n
Keeping
t
7800: run --dir-diff tests with and without
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
p
in
g
t7800: fix tests w
h
en difftool us
e
s --no
-
sy
m
l
i
nks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n
Keeping
t7800: don'
t
h
ide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool: don't overwrite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eepi
n
g
t
7800
:
move '--symlinks'
s
pec
i
fic test to
the e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John K
e
eping
merg
e
-tree: fix typo in m
e
r
g
e-
t
ree
.
c::unres
o
lved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
hn K
e
eping
refs
.
c: fix fread error hand
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
entry: fix filter l
o
oku
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003
:
modernize s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
difftool --dir-dif
f
: symlink all fil
e
s matching
th
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
difftool
:
avoid d
o
uble s
l
as
h
es in symlink target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n Keeping
git-diffto
o
l(1): fix
f
orm
a
tting of --sy
m
link
descri
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
ohn Keepin
g
R
evert "g
r
a
p
h
.
c: m
a
rk
p
riv
a
t
e file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile: m
a
ke mandir
,
htmldir and infodir ab
s
olute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
rebas
e
-i: respect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-
d
iff
.
c: t
e
ach combine
d
dif
f
s about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
d
i
ff
.
c:
u
s
e d
i
ff_li
n
e_
p
refix()
w
h
ere app
l
icable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
diff: add diff_line_prefix functio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c:
m
ake cons
t
ant string argume
n
t
s
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Ke
e
ping
di
f
f
: w
r
it
e
prefix to the correc
t
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
g
rap
h
: out
p
ut p
a
d
d
ing fo
r
m
e
r
ge subsequen
t
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t
4
038: add tests fo
r
"
diff --cc
-
-r
a
w <t
r
ees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John K
e
eping
bu
i
ltin/apply: tig
h
ten (dis
)
s
i
mil
a
r
i
ty index pa
r
s
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Keeping
mergeto
o
l
--lib: li
s
t user co
n
figured tools i
n
'
-
-
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
enam
e
{git- => gi
t
}remote-
h
elpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Codi
n
g
G
uidelines: a
d
d
P
ython cod
i
ng guidelines
commit
|
commitdiff
|
tree
2013-01-28
John K
e
eping
g
it-remote-testpy:
f
ix path
h
ashin
g
on Py
t
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
me
r
ge
t
ool--lib: d
o
n't ca
l
l
"exit" in
s
e
tup
_
tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-difftool: u
s
e
git-
m
e
rgetool--lib for
"--to
o
l
-
help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git
-
mergetoo
l
:
don't hard
c
ode
'
mergetool' in sho
w
_tool_
h
elp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-mergetool:
r
emove redu
n
dant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pin
g
gi
t
-m
e
rgetool: move sho
w
_t
o
ol_help to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
gi
t
-remote-te
s
tpy: call
p
rint as a f
u
nctio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
eping
git-r
e
m
ote-testpy: don't do unbuffe
r
ed text
I
/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t
-
r
emote-t
e
s
tpy: hash byte
s
expl
i
citly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Ke
e
p
ing
svn-fe: allow svnrdu
m
p_s
i
m
.
py to run with Py
t
h
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git_remot
e
_helpers: use 2to3 if b
u
ilding with
Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it_remote_helpers:
force rebuild i
f
python vers
i
on
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Kee
p
ing
git-cvs
i
mport
.
txt:
c
v
sps-2
i
s deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
o
h
n Keeping
g
i
t
-
for
-
each-ref
.
txt: 'raw'
is a supported date f
o
rmat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John K
e
e
ping
git
_
remote_helpers: fix i
n
put when
r
u
nning u
n
der P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remot
e
_h
e
lper
s
: allow
b
uil
d
ing with P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keepin
g
git
-
s
v
n: teach f
i
nd-rev to find
near match
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Keeping
git-fast-import(1): reor
g
ani
s
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John K
e
eping
git-fas
t
-
i
mport(1): combi
n
e
documentation of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
it-shortlog(1): document
b
ehavi
o
u
r
o
f
zero-w
i
dth w
r
ap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fast-im
p
ort(1
)
: re
m
ove d
u
plicate '--done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
J
ohn Keeping
Documentation: don
'
t
l
i
nk
t
o e
x
ample m
a
il a
d
dresse
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
r
eb
a
se -i co
n
tinue: do
n
't
skip c
o
m
mits that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree