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 'maint'
2014-07-16
John Keep
i
n
g
rebase: omi
t
p
a
tch-identica
l
commits w
i
th --fork-po
i
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John
K
e
e
ping
reba
s
e--am: use --cherr
y
-pic
k
in
s
tea
d
o
f --ignore-
i
f
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Ke
e
ping
completion: add missing opti
o
ns for git
-
merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
com
p
letion: add a note t
h
at merge options a
r
e shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
o
hn Keeping
builtin/mv: fix
o
ut of b
o
unds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
buil
t
in/mv: don't use m
e
mory
a
fter free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
u
tf8: use corr
e
ct type f
o
r
values in interv
a
l
t
ab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Keeping
utf8: fi
x
iconv error detect
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
ing
n
o
tes-utils: handle bo
o
lean no
t
es
.
re
w
r
i
t
emo
d
e
c
o
r
rectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
J
ohn K
e
e
p
ing
M
a
kef
i
le: remo
v
e redunda
n
t obj
e
c
t
in git-ht
t
p{fetc
h
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
Joh
n
Ke
e
p
i
ng
p
u
ll: suppress
e
rror
whe
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 Keeping
complet
i
on: handl
e
-
-[n
o
-
]
fo
r
k-point options
t
o git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
o
hn Keeping
completion
:
co
m
plete merge
-
base option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John K
e
eping
rebase: fix
fork-point with zero argumen
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
o
hn Keeping
rebase: use reflog to find commo
n
base with
ups
t
r
eam
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Ke
e
pin
g
pull: u
s
e merge-base --fork-
p
oin
t
wh
e
n
a
ppro
p
riate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
p
eek-r
e
mote: remove deprecated alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-fou
n
d: remove
deprecate
d
comma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keepin
g
tar-tree: remove depre
c
a
t
e
d
c
ommand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
repo-config:
remo
v
e depreca
t
e
d
a
lias for "git confi
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
o
hn K
e
eping
Documentation/
M
akefile
:
m
ake AsciiDoc dblate
x
d
ir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-recursive: f
i
x parsi
n
g of "d
i
ff-algorithm" opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
r
e
set: ha
n
dl
e
subm
o
d
u
le wi
t
h tra
i
ling sl
a
sh
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
oh
n
Keeping
rm
:
re-use par
s
e_pathspec's trai
l
ing-slash
r
emoval
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
ohn
Ke
e
ping
git
_
remote_h
e
lpers: remov
e
l
ittle used Pyt
h
on li
b
rary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn K
e
eping
r
ev-pa
r
s
e
(1): l
o
g
ic
a
lly group
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
r
e
v
-parse: rem
o
v
e rest
r
i
ctions on
s
ome options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keepin
g
pull: change
t
he descr
i
ption to "i
n
teg
r
ate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
h
n
Ke
e
ping
push
:
avoid sugge
s
ting "merging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
gi
t
-conf
i
g(1): clarify prec
e
dence of
m
u
lti
p
le
v
alues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-config: upd
a
t
e
doc
f
or
-
-get with multipl
e
v
alues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keepi
n
g
completio
n
: l
e
arn about
-
-
man-pat
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keepi
n
g
completion: han
d
le unst
u
ck
f
or
m
o
f
b
a
s
e git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
f
a
s
t-import:
allow m
o
ving
t
h
e root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
ng
fast
-
import: allow ls or fil
e
c
o
py of the
r
oot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
fast-import: s
e
t valid mode on
r
o
ot
t
r
e
e i
n
"l
s
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9300: doc
u
ment
f
ast-import emp
t
y
pat
h
issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
i
ng
subm
o
d
ule
:
drop the top-level r
e
quire
m
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-parse:
add --p
r
efi
x
op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
ubmodule
:
show
f
ull pat
h
in
error messag
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
t74
0
3: add missin
g
&&
c
ha
i
ning
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t7403:
m
odernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keepin
g
t7401: make indentation consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keeping
m
e
r
g
etool--lib: refactor
{diff,merge}_cmd
l
ogic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
pin
g
Documentation
/
Makefil
e
: move infod
i
r
t
o
be w
i
th ot
h
er
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Kee
p
i
n
g
Do
c
ument
a
tion/Makefile: fix spaces around assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keepi
n
g
add--
i
nteracti
v
e: re
s
p
ect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John
K
eeping
gi
t
-gui: fix file name handl
i
ng with non-emp
t
y prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Ke
e
p
i
ng
fe
t
ch: do
n
't try to update unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
diffto
o
l: fix dir-diff when file does
n
o
t exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n Keeping
merge-tree
:
handle directory/empt
y
conflict cor
r
e
ct
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John K
e
eping
t/Makefile: don't
d
efine
TEST_
R
ESULTS
_
DIRECTORY recursiv
e
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib/subtree
:
do
n
't delet
e
remote branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
ohn K
e
eping
tes
t
output: respect $TEST_OUTPUT_DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
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
Joh
n
K
eeping
merge-
t
ree: fix typo in "both
changed i
d
entically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Joh
n
Keeping
t/Makef
i
le
:
fix re
s
ult handlin
g
with TEST_OUTPUT_DIRECT
O
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
t
r
a
nsport-helpe
r
: a
d
d
'signed-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
K
e
eping
t
ransport-helper: pass --signed-tags=wa
r
n-strip
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-export:
add --sign
e
d
-
tags=w
a
rn-s
t
r
i
p
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-
l
ib
.
sh
:
fix
TRAS
H
_DIREC
T
ORY han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't
print entries
that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gi
t
remote-helpers(1)
:
clari
f
y refspec beh
a
viou
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keepin
g
sub
m
odule
:
p
r
int
g
r
aph output
nex
t
to
s
ubmodule
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
diff: a
l
lo
w
unstuck argu
m
ents with -
-
d
iff-al
g
orithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn
Keeping
git-mer
g
e(1): do
c
u
ment diff-a
l
g
o
rith
m
o
p
t
ion to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Kee
p
ing
bisect
:
avoid signed inte
g
er
o
verflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
eping
diffcore-
b
reak: don
'
t divid
e
by z
e
r
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t7800: run --di
r
-
diff tests
with and witho
u
t symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t7800: f
i
x
tests when
d
ifft
o
ol
use
s
-
-no-sy
m
l
i
nk
s
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 Ke
e
pin
g
di
f
f
t
ool: d
o
n'
t
overwrite modified f
i
les
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t7800: move '--sy
m
links'
spe
c
i
f
ic
t
est to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
m
e
rg
e
-
t
re
e
: fix typ
o
in mer
g
e-t
r
ee
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keepin
g
r
e
f
s
.
c
: fix
fread error handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
entry: fix
f
ilter
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eep
i
ng
t2003: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difft
o
ol --dir-diff:
s
yml
i
nk all fi
l
es
matchi
n
g the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Ke
e
ping
di
f
ftool:
avo
i
d
double slashes in
symlink
targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
git-diffto
o
l(1): fix formatting of --s
y
mlink d
e
s
cri
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
Keep
i
n
g
Revert
"
g
raph
.
c: m
a
rk priva
t
e fi
l
e-scope
sy
m
bols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
ohn Keeping
Makefile: mak
e
mandir,
htmldir and infodir absolu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
reba
s
e -i: re
s
pect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
i
n
g
comb
i
ne-diff
.
c: teach
combined diffs about li
n
e prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
d
i
ff
.
c: us
e
diff_line_prefix() wher
e
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: a
d
d diff_line
_
p
refix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
d
iff
.
c: mak
e
cons
t
an
t
string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Kee
p
ing
diff: write pr
e
fix to the corre
c
t file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
K
eeping
graph:
ou
t
pu
t
pa
d
ding for merge subse
q
uent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
h
n Keeping
t
4038: ad
d
tests for
"
d
i
ff --cc --raw <trees
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keepi
n
g
buil
t
in/app
l
y: t
i
g
h
ten (di
s
)simila
r
ity index pars
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eeping
m
ergetool
-
-li
b
: list user
configured tools in '--t
o
ol
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Joh
n
Keeping
R
e
nam
e
{git- => g
i
t}re
m
ote-hel
p
ers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
K
eeping
C
odingGuide
l
ines: ad
d
Pyt
h
on
co
d
ing guide
l
ines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-re
m
ote-t
e
stpy: f
i
x path h
a
shin
g
on P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Kee
p
ing
merg
e
tool
-
-lib
:
don't call "exi
t
" in setup_too
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
eepi
n
g
git-
d
ifftool: use
g
i
t
-mer
g
et
o
o
l
-
-
l
ib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-m
e
rget
o
ol:
d
on't hardcode
'mergetool' in
show_tool_
h
elp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mergetool
:
remove red
u
nda
n
t assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-m
e
rgetool: mov
e
show_too
l
_
h
elp to mer
g
e
tool-
-
lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next