repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/test-lazy-prereq' (early part)
2014-05-27
John Keepi
n
g
completi
o
n
: add mi
s
s
in
g
options fo
r
git-merg
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
completi
o
n:
a
dd
a note that me
r
ge options are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
builtin/mv: fi
x
out of b
o
un
d
s
wri
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
builtin/
m
v: don't use memory aft
e
r free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8
:
use
correct type for values
i
n
inte
r
val
t
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
u
tf8: fix ico
n
v
e
rror detec
t
io
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
K
e
e
ping
not
e
s-
u
tils: ha
n
dle b
o
ole
a
n notes
.
re
w
ritemode
c
or
r
ectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefile: rem
o
ve
redundant object in gi
t
-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
Jo
h
n Keepin
g
pull:
suppre
s
s 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
com
p
letio
n
: handle
-
-[no-]fork-p
o
int op
t
io
n
s to g
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completi
o
n: complete merg
e
-base o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
o
hn
K
eeping
rebase: fix
fork-poi
n
t
w
i
t
h
zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
o
hn
Keeping
r
e
base:
u
se reflog to find common
b
ase with upstrea
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
o
hn
Kee
p
ing
pull:
use merg
e
-
b
ase
--fork-point when appro
p
r
i
ate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Keeping
peek-remote: re
m
ove deprecated alia
s
of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-f
o
und: remove d
e
precate
d
c
o
m
m
a
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tree: r
e
mo
v
e d
e
pre
c
ated
c
ommand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Kee
p
i
n
g
repo-c
o
nfig
:
remove deprec
a
ted alias for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentation/Makefile: make AsciiDo
c
d
blatex
dir configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-r
e
cursive:
fix pa
r
sing of
"
di
f
f-algorithm
"
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
r
e
set
:
handle submod
u
le
wi
t
h
trailin
g
slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm
:
re-use parse_pathspec'
s
tr
a
ilin
g
-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Kee
p
ing
g
it_remote_helpers:
rem
o
ve litt
l
e us
e
d Python libr
a
r
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
eep
i
ng
rev-pa
r
se(1): logically group
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keep
i
ng
rev-
p
a
rse: remove
r
estri
c
tions
on some opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: change t
h
e de
s
cription
t
o
"
inte
g
rate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Kee
p
ing
push: a
v
oid suggesting
"merging
"
remote cha
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
g
i
t-config(1)
:
clarify pr
e
c
edence of
multiple va
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Joh
n
Kee
p
ing
gi
t
-config: upda
t
e
doc for --get wit
h
multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
comp
l
etion:
l
earn about --man
-
path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn K
e
eping
completi
o
n
:
h
a
n
dle unst
u
ck form of b
a
se g
i
t opti
o
ns
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
a
st
-
i
mpo
r
t: allow mov
i
ng the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
fast
-
im
p
ort: allow
l
s or fileco
p
y o
f
the r
o
ot tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keepi
n
g
fast-import: set va
l
id mode on root tr
e
e
in
"
ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Ke
e
ping
t
9
3
00: document f
a
st-im
p
ort emp
t
y path i
s
sues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Ke
e
p
i
ng
subm
o
dule: drop the top-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n
K
e
e
ping
r
e
v-parse: add --
p
refix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
su
b
module: show full
p
ath in er
r
or mes
s
age
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
t7403:
a
dd m
i
s
sing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t7403:
m
o
d
e
r
n
ize
st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: make ind
e
ntation consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Kee
p
ing
mergetoo
l
--lib: refactor {diff
,
m
er
g
e}
_
cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documen
t
atio
n
/Makefile:
move infodir to be wi
t
h othe
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
Documentation
/
Makef
i
le: fix spaces aroun
d
assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
add--interac
t
iv
e
: r
e
spect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Ke
e
ping
git-gui: fix file name
h
andling with non-e
m
p
t
y prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
o
hn Keep
i
ng
fetch: don't
t
ry to
u
p
date unfetc
h
ed trackin
g
ref
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
Keeping
diff
t
ool: fix
d
i
r
-diff when file d
o
es
n
ot e
x
ist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-
t
ree: handle dire
c
tor
y
/empty c
o
nflict correc
t
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John
K
e
e
ping
t/Makefile: don't def
i
ne TEST_RESULTS_DI
R
ECTORY recursive
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keepin
g
c
ontrib/subtree:
d
o
n't delet
e
rem
o
te branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
o
hn Keeping
test output: respect $TEST_OUTPUT_DI
R
ECTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keep
i
ng
t
/Makefile
:
remo
v
e
smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tree:
fix typo in "both changed
i
dentically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/M
a
kefile:
fix result han
d
ling with TEST_OUTP
U
T_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n K
e
e
ping
transpor
t
-
h
elper: add 's
i
gned-tags
'
cap
a
bility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
transport-helper: pa
s
s --
s
igne
d
-tags=warn-s
t
rip
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
f
a
st-exp
o
rt: add --s
i
g
n
ed-tags=w
a
r
n
-
strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-li
b
.
sh: fix TRASH_
D
IR
E
CTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't print
e
ntries
t
h
a
t m
a
tch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John K
e
eping
gitr
e
mote-helpe
r
s(1): clarify re
f
s
pec
behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
submodule: pri
n
t
gr
a
p
h
o
utput n
e
xt to
s
u
b
m
odule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
ng
diff: allo
w
unstuck argum
e
n
t
s with
--diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge(1): d
o
cument diff-algo
r
ithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bi
s
ect: avoid sign
e
d integer ov
e
r
flow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
d
iffcore-
b
r
e
a
k: don't
divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800
:
run --dir-dif
f
t
es
t
s wit
h
and
wit
h
o
u
t
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t7800:
fix tests when difftool uses --n
o
-sy
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Ke
e
pi
n
g
t7
8
0
0
: don't h
i
de grep ou
t
put
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
di
f
f
too
l
:
don't
o
verwri
t
e
m
odifie
d
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
e
p
ing
t780
0
:
mov
e
'--
s
ymlink
s
' spec
i
fic test
t
o t
h
e end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn Keeping
m
e
r
ge-tree: fi
x
typ
o
in merg
e
-tree
.
c::unr
e
solved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John
K
eep
i
ng
refs
.
c
:
fix
f
rea
d
error h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
ent
r
y:
fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
t2003
:
m
odernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
oh
n
Ke
e
p
i
ng
difftool --
d
ir-d
i
ff: sym
l
ink a
l
l files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: avoid dou
b
le slashes in syml
i
nk targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
git-difftool(1)
:
fix forma
t
ting of -
-
symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
o
hn
Kee
p
ing
Re
v
ert "graph
.
c: ma
r
k private file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John K
e
eping
Makefil
e
: make man
d
i
r
,
htmldir and infodi
r
absol
u
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
r
e
base
-i: respect cor
e
.
com
m
en
t
char
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn
K
eeping
co
m
bine-diff
.
c: teach co
m
bine
d
di
f
fs
a
b
ou
t
li
n
e prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
diff
.
c: use diff_
l
ine_prefix() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add d
i
ff_line_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
diff
.
c: make
const
a
nt string arguments
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
K
eeping
diff: write prefix to the corr
e
ct fil
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: output paddin
g
for merge
subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
K
eeping
t4038: add te
s
ts for "diff --cc
--raw <tre
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
builtin/apply: tighten (dis)similarity
i
ndex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
n
g
mergetool--lib:
list user configured too
l
s in
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
K
e
eping
Rename {
g
it- => git}re
m
ote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn Keeping
C
o
d
in
g
G
uidelines: add Py
t
hon coding
g
uidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-tes
t
py:
f
ix pat
h
ha
s
hing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn
Keep
i
n
g
merget
o
ol--lib: do
n
't
c
all
"exit"
in setu
p
_t
o
ol
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-difftool: use
g
it-mergetool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
me
r
g
e
t
ool
:
d
o
n't ha
r
dcode 'merg
e
tool' in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: remove
redundan
t
assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
Keeping
g
i
t
-mergetool: m
o
ve sho
w
_tool_help to merge
t
oo
l
--li
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
r
e
mote-
t
estpy: cal
l
print as
a
fun
c
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keep
i
ng
git-remot
e
-testpy: don't do unbuff
e
re
d
text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next