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 'ep/avoid-test-a-o'
2014-07-16
John Keeping
re
b
a
se: omit pa
t
ch-ident
i
c
a
l commits with
-
-fork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Kee
p
i
n
g
re
b
ase--am:
use --cherry-pick instea
d
o
f
-
-
ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
completion: add
m
iss
i
ng opti
o
n
s
for gi
t
-merg
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keep
i
ng
completion:
a
dd a not
e
th
a
t
m
e
rge options are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John
K
e
eping
bu
i
l
t
i
n
/mv: fix o
u
t of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n Keeping
bu
i
ltin/mv
:
don't use m
e
mory
after f
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
u
t
f8:
u
se correct type for
value
s
in inte
r
v
a
l table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keepi
n
g
u
t
f8: fix ico
n
v
e
rror detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John K
e
epi
n
g
notes
-
utils:
handle boolean notes
.
re
w
ritemode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
Joh
n
Keeping
M
akef
i
l
e: remove redu
n
dan
t
object in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keeping
p
ull: suppress error when no remoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
o
hn Keeping
c
o
mpl
e
ti
o
n: handle
--[
n
o-]fork
-
point options to gi
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
o
hn
K
e
e
p
ing
completion: com
p
le
t
e merg
e
-
b
as
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Kee
p
ing
re
b
a
s
e
: fix fork-
p
oint with zero a
r
gumen
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
rebase: use reflog to find co
m
mon b
a
se with upstr
e
am
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
p
ull: use merge-bas
e
--f
o
r
k-point wh
e
n appro
p
ri
a
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
ping
peek-r
e
mote:
r
e
m
o
ve deprecated alias of
ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n Keeping
lost-found: remove
d
epreca
t
ed command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
ta
r
-tree: r
e
move depr
e
cated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Keeping
re
p
o
-
config: remove deprecated
a
l
ias for "gi
t
config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Jo
h
n
Keep
i
ng
D
o
cu
m
entation/
M
akef
i
le: make AsciiDoc dblatex dir conf
i
gurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merg
e
-r
e
cursive
:
fix parsing of "diff-algorithm
"
o
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Ke
e
ping
reset: handle submo
d
ule wi
t
h t
r
ailing sl
a
s
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
K
e
e
ping
rm: r
e
-use p
a
r
s
e_pathspec's trailing-slas
h
removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n
K
e
e
ping
git_r
e
mote_helpers: rem
o
ve little u
s
e
d
P
y
thon library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn Keep
i
ng
rev-parse(1): logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn Keeping
rev-parse:
remo
v
e
restrictions
o
n so
m
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
Joh
n
Keeping
pull: change the descrip
t
ion to "int
e
grate" chang
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
e
eping
push: avoid suggesting
"
merging"
remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
ohn Keeping
git-co
n
f
i
g(1)
:
c
l
a
r
if
y
precedence o
f
mu
l
tiple valu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Joh
n
K
e
eping
git-config: upda
t
e doc
f
or --get with mu
l
tiple val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keepin
g
completion: l
e
arn
about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n
Kee
p
ing
com
p
letion: handle unstu
c
k fo
r
m of
base git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepi
n
g
f
ast-
i
mport:
a
ll
o
w moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: allow ls or
f
ileco
p
y
o
f th
e
root tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Ke
e
p
ing
fast-import:
s
et
v
alid mode on root tree
i
n "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
t9300: docume
n
t fast-import empty
p
a
th
i
ssues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
submodu
l
e: drop the top-level r
e
qu
i
rement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
rev-
p
arse:
a
dd --pre
f
ix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
e
eping
subm
o
dule: show full pa
t
h in
e
rror messag
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
t74
0
3: add missing &
&
chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keepi
n
g
t7403:
m
oderniz
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Kee
p
in
g
t7401: mak
e
inde
n
tation
c
onsistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
mergetool--lib:
r
efactor {diff,
m
erge}_
c
m
d
logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
Do
c
u
men
t
ation/Makefile: move infodir to be
w
ith other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eepin
g
Document
a
t
i
on/Makefile: fix s
p
aces aro
u
nd as
s
ignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John
Keeping
add-
-
interact
i
ve: respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keeping
git-gui: fix
f
ile
name handl
i
n
g
with no
n
-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
o
hn
K
eeping
fe
t
ch: d
o
n'
t
try to
u
pda
t
e
unfetched
tra
c
kin
g
refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
Keeping
d
ifftool: fix
d
ir-dif
f
when file does not ex
i
st in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
ohn Keeping
m
erge-tree: h
a
n
d
l
e
direct
o
r
y
/
empty conflict corr
e
c
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Ma
k
efile: don
'
t d
e
fine TEST_RESULTS_DIRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Kee
p
ing
c
o
nt
r
ib/sub
t
ree: don't delet
e
r
e
mot
e
branches if spli
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
Keeping
t
e
s
t output: respect $TE
S
T_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eeping
t/Makef
i
le: remove s
m
oke test targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Ke
e
p
i
ng
merge-tr
e
e: fix
t
yp
o
in "both changed 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 resul
t
handling with TEST
_
OUTPUT_DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transp
o
rt
-
helper: add 'sign
e
d-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
ra
n
sport-help
e
r: pass --signed-t
a
gs=
w
arn-strip
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
fast-e
x
p
ort: add --sig
n
ed-
t
a
g
s
=warn
-
s
t
r
i
p mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
/
tes
t
-lib
.
sh:
f
ix TRAS
H
_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't print
entries that
matc
h
"loc
a
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitre
m
o
t
e-helpers(1): clarify refsp
e
c behavio
u
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
submodu
l
e: print graph ou
t
put n
e
xt to
s
ubmodul
e
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn
Keepi
n
g
diff: allow unstuck argu
m
en
t
s
with --dif
f
-algor
i
thm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
ng
git-mer
g
e
(
1)
:
document diff-algorithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
e
eping
bi
s
ect: avoid signed
i
n
teger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eeping
diffcore-break: don't
divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
e
p
ing
t
7
800: ru
n
--dir-diff test
s
with
a
nd wi
t
hout
s
y
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: fix test
s
when d
i
ffto
o
l uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
e
ping
t7800: don
'
t hide gre
p
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keep
i
ng
difft
o
ol: don't overwr
i
te
modified
fil
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t78
0
0:
m
o
v
e '--symlinks' s
p
e
c
ific test t
o
the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Ke
e
pi
n
g
m
e
rge
-
tree: fix typo in
m
erge-tre
e
.
c::
u
nreso
l
ved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
hn Keep
i
n
g
r
e
fs
.
c: fix fr
e
ad error handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: f
i
x filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
ee
p
ing
t2
0
03
:
mo
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eep
i
ng
difftool --dir-diff: symlink all files matchi
n
g the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
K
eeping
diffto
o
l
:
av
o
id double slashes i
n
syml
i
nk tar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
git-difftool(1): fi
x
formatting of --symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c:
m
ark
p
riv
a
te file-
s
cope sy
m
bols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn Keeping
Makef
i
le: make man
d
ir, htm
l
d
i
r and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
rebase
-
i: respe
c
t core
.
commentc
h
ar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
combine-diff
.
c: teach c
o
mbined diffs ab
o
u
t line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: use diff_line_prefix() where appl
i
ca
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
dif
f
: add
d
iff_lin
e
_
p
r
e
fix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make constant stri
n
g arguments
c
o
n
st
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
d
i
ff: w
r
ite prefix to the
correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Jo
h
n Keep
i
n
g
graph:
o
utput padding
for me
r
ge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
K
eeping
t403
8
:
add tes
t
s for "di
f
f --cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
oh
n
K
e
eping
builtin
/
app
l
y: tighten (
d
is)similarity in
d
ex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Ke
e
ping
m
erg
e
tool--li
b
: list user configured tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
e
n
a
me {git- => gi
t
}
r
emote-h
e
l
p
ers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidelines: a
d
d Python codin
g
guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Kee
p
i
n
g
git-remote-testpy: fix pa
t
h hashing on P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Ke
e
pin
g
mergetool--lib
:
don't call
"ex
i
t
"
in s
e
tup_to
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-difftool
:
us
e
git-mergetool--lib
for
"--tool-help
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-mergetool: don't
hardcode
'
mergetool' in show_too
l
_hel
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergeto
o
l: re
m
ove
r
edundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
g
it-mergetool:
m
o
ve show_tool_help to merget
o
ol--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next