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
pull: suppress error when no remoteref is found
2014-01-17
John
K
eeping
pull: sup
p
ress error when no re
m
o
t
e
ref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Kee
p
ing
r
ebase: fix fork-poin
t
with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
Jo
h
n K
e
eping
re
b
ase
:
use
re
f
log
to find common base wi
t
h up
s
tream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
pu
l
l:
u
se merge-base
--fork-point
w
hen
ap
p
rop
r
iate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
ohn Keeping
Documentation/Makefile: make AsciiDoc dblatex dir confi
g
u
rable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
Joh
n
Keeping
merge-
r
ecursive: fix
parsi
n
g of
"
d
iff-algorit
h
m" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepin
g
r
e
s
e
t
: han
d
le submod
u
le with traili
n
g slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
K
e
e
ping
rm: re-use parse_pathspec's trailing
-
slash remo
v
al
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
K
e
eping
git_remote_helpers: remove little
u
sed Python librar
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
eep
i
ng
r
ev-parse(1)
:
log
i
call
y
g
r
oup o
p
t
i
on
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
ping
rev
-
parse: remove restric
t
ions
o
n s
o
m
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: cha
n
ge the d
e
s
c
ription to "in
t
egr
a
te"
c
hanges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keepi
n
g
push: avoid suggesting "merging" remo
t
e ch
a
nges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
ohn Keeping
git-conf
i
g
(1): clarify preced
e
nce of mu
l
t
iple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
o
hn K
e
e
p
ing
g
i
t
-config: update doc for --
g
et with m
u
ltiple value
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
Keeping
comple
t
ion: learn about
-
-
man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keepin
g
c
o
mpletion: handle u
n
stuck
f
o
rm
o
f base git opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: a
l
low moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn Keeping
fas
t
-import: al
l
ow ls or fil
e
copy
of the root tre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
fast-import:
se
t
valid mode on r
o
ot tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn
K
ee
p
i
ng
t9300: do
c
ument fast
-
import empty p
a
th is
s
u
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
s
u
bmodule: drop
t
he
t
op-leve
l
requi
r
ement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
rev-parse:
add --prefix op
t
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
p
ing
s
u
bm
o
dule: show full
p
ath
in er
r
or messa
g
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t74
0
3
: add missing && c
h
a
i
ning
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t74
0
3: m
o
d
e
rnize
sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t740
1
:
m
ake i
n
dent
a
ti
o
n
c
ons
i
stent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
mergetool--lib
:
r
e
f
act
o
r {d
i
f
f
,merge}
_
c
md
l
o
gic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
Documenta
t
i
o
n/Makefile: move in
f
odir
to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentation/Ma
k
efile: fix spaces ar
o
und
a
ssignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
hn Keepin
g
add-
-
i
n
teractive: res
p
ect
d
iff
.
algo
r
ithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John
Keepi
n
g
git-gui: f
i
x file name hand
l
ing w
i
th non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
o
hn Keepi
n
g
fetch
:
don't try
to u
p
date un
f
etch
e
d tracking
r
e
fs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
o
hn
K
ee
p
ing
difftool: fix
dir-diff
when f
i
le d
o
es
not ex
i
st in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
o
hn Keeping
m
erge-tree: handle dir
e
ct
o
ry/empty conflict correc
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John
K
eepin
g
t/Makefile: don't
d
efine TEST_RE
S
ULTS_DIRECTORY recur
s
ively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Joh
n
Keep
i
ng
con
t
r
i
b/subtree: don't delete remo
t
e branches
i
f sp
l
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test o
u
tput: r
e
s
pect $TES
T
_OU
T
PU
T
_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keep
i
ng
t/Makefile:
re
m
ove
s
moke test
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-
t
ree: f
i
x
t
ypo in "b
o
th changed
ide
n
tically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Jo
h
n Keeping
t/Makefile: fix
r
esult han
d
ling with
TEST_OUTPUT_DIRE
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
tran
s
por
t
-he
l
p
er:
add '
s
igned-t
a
gs' capa
b
ility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
e
ping
transport-helper: pass
--signed-tags=w
a
r
n-str
i
p t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-export:
a
dd --signed-t
a
gs=w
a
rn-s
t
rip
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/
test-lib
.
sh: fix TRASH_DIRECTORY handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
e
e
ping
merge
-
t
ree: d
o
n't print
e
n
t
r
ies th
a
t match "loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
h
n Keeping
gi
t
re
m
ote-helpers(1):
cla
r
ify refspe
c
behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
subm
o
d
ule: p
r
int g
r
aph output next to sub
m
o
d
u
le log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
d
i
ff
:
allow
u
nstuck
a
r
gum
e
nts with
-
-dif
f
-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
eping
git-merge(1)
:
document d
i
f
f-algorithm opti
o
n to me
r
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
b
i
sect: a
v
oi
d
sig
n
ed
i
nteger ov
e
rflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
e
e
pin
g
dif
f
c
ore-
b
reak:
don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keep
i
ng
t7800: run --
d
ir-d
i
ff
t
e
sts with
and witho
u
t symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t78
0
0:
f
ix tests when difftool u
s
es --no-s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t
7800
:
don't hide
grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Kee
p
ing
diff
t
ool: don't
overwrit
e
modifi
e
d file
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
i
n
g
t
7
800: move '--symlinks' sp
e
cifi
c
test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Joh
n
Kee
p
ing
me
r
g
e
-tree: fix typo in merge-t
r
e
e
.
c
:
:
unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
ref
s
.
c
: f
i
x fread error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix fil
t
e
r
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
t20
0
3
:
m
odern
i
ze
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
di
f
ftool --dir
-
diff: symlink
all
f
i
l
es matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keep
i
ng
d
i
ffto
o
l: avo
i
d double slashe
s
i
n
symlink ta
r
g
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1): fix formatting of
-
-sy
m
l
ink descri
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keepi
n
g
R
evert
"graph
.
c: mark priv
a
te file
-
scope sym
b
ols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
K
eeping
Makefile: make
mandir, htmldir
a
nd in
f
odir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i:
r
espect co
r
e
.
comme
n
tcha
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
c
o
mb
i
ne-diff
.
c:
t
each combined
diffs
a
bout
l
ine
p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eepi
n
g
d
i
ff
.
c: use d
i
ff
_
line_
p
refi
x
(
)
where
a
pplicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
diff: add diff
_
line
_
p
r
e
fix func
t
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
K
e
eping
diff
.
c: m
a
ke co
n
s
t
a
nt str
i
ng argume
n
t
s con
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
e
ping
dif
f
: write prefix to the correct
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
oh
n
Keeping
g
r
a
p
h: outp
u
t padding for m
e
rge
s
ubsequent parent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
h
n Keeping
t4038: add tests for "di
f
f --cc --raw <t
r
ees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keepin
g
builtin
/
appl
y
: tighten (dis)simila
r
ity index
pars
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Kee
p
ing
mer
g
etoo
l
-
-lib: li
s
t use
r
co
n
fi
g
ured
t
o
o
ls
in '--to
o
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Keeping
Ren
a
m
e
{git- => git}remote-h
e
lpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingG
u
idelines
:
add Pytho
n
cod
i
ng guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-rem
o
te-t
e
stpy:
f
ix path hashing on Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keep
i
ng
mergetool--lib: don't ca
l
l "exi
t
" in
s
etup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git
-
diffto
o
l: use git-m
e
r
g
etool-
-
lib for "--tool
-
help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-mergetool: don'
t
ha
r
dcode 'mergetool'
i
n show_tool
_
he
l
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
eping
git-me
r
getool: remove redundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merget
o
ol:
m
ove show_tool_help to me
r
getool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-r
e
m
ote-testpy:
call print
as
a funct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-remote-testpy:
d
on't do unbuf
f
e
red
t
ext
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn
K
e
ep
i
ng
git-remote-testpy: hash
b
yt
e
s
e
xp
l
icit
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
svn-
f
e:
a
l
low svnrdum
p
_sim
.
p
y t
o
run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git_remo
t
e_helpe
r
s: use 2to3 if building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keepin
g
git_
r
emote_
h
e
l
per
s
:
f
o
rce rebuil
d
if p
y
thon ve
r
sion
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
g
i
t-cvs
i
mport
.
txt: cvsps
-
2
is depreca
t
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
ohn K
e
epi
n
g
git-for-eac
h
-ref
.
txt
:
'raw' is a support
e
d
date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n
K
e
e
ping
git_re
m
ote_h
e
lpers: f
i
x input when running und
e
r Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote_h
e
lpers: allow building
w
ith Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keepin
g
git-svn: teach
f
ind-re
v
to find ne
a
r matc
h
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
K
e
e
ping
git-fast-imp
o
rt(1): reorganis
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Kee
p
ing
git-fast-impor
t
(1): combine
documentation o
f
--[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
Keeping
git-shortlog(
1
)
: doc
u
ment behav
i
our of zero-width wr
a
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fast-import(1):
r
e
move
d
u
plicate
'
--done' op
t
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keepin
g
D
ocumen
t
ation: don't li
n
k
to example mail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next