repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'nd/t1509-chroot-test'
2015-03-31
Joh
n
Keeping
s
t
reaming
.
c: fix a
m
eml
e
ak
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
c
o
mpletion:
c
ompl
e
te `git
push --forc
e
-with-
l
e
ase=
`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
completion: add so
m
e m
i
ssing o
p
tions to `git push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John K
e
eping
completio
n
: co
m
plete "unstuck"
`git
p
u
s
h --recur
s
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
J
o
hn Keeping
rebase: omit patch
-
i
dentical commit
s
with --fork-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keeping
re
b
ase--am: use
-
-cherry-pick instead of -
-
ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
compl
e
tion: add
miss
i
n
g options for gi
t
-m
e
rge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
comple
t
i
o
n:
a
d
d a
note
that me
r
g
e
options are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
ohn Keeping
buil
t
i
n/m
v
:
f
ix
out of
bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
builtin/mv: don
'
t use memory after f
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Keeping
utf8: use correct type
f
or values in interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
K
eeping
u
tf8:
fix
i
co
n
v error detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
ing
notes-util
s
: handle b
o
olea
n
not
e
s
.
rewritemod
e
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
M
a
k
efile: remove redundant object
i
n git
-
h
ttp{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John K
e
eping
p
ull: sup
p
ress error when n
o
remoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
compl
e
t
i
on: handle
--
[
no-]f
o
rk-point opti
o
n
s
t
o
g
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn Keeping
compl
e
t
ion: complete mer
g
e-ba
s
e optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebase: fix
fork-point with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keepin
g
reb
a
se: use reflog to find common base wit
h
upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Joh
n
Keeping
p
u
ll: use merge
-
base
-
-fork-point when ap
p
ropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
n
g
peek-r
e
mote:
r
emove deprecated ali
a
s of ls-remot
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
p
i
ng
lost-fo
u
n
d: remove
d
epr
e
cated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Keeping
tar-tree: remove deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
repo-config: remove deprecated alias
f
or "g
i
t
config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Jo
h
n K
e
e
p
ing
Docu
m
e
n
tatio
n
/Mak
e
file: make AsciiDoc dblatex dir configur
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-recurs
i
ve: fix p
a
rsing of "d
i
ff-a
l
gorith
m
" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
res
e
t: handle submodule with trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-use pars
e
_pathspec's trai
l
ing-slash re
m
oval
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n K
e
epin
g
g
i
t_remote_helper
s
: re
m
o
v
e little us
e
d
Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse(1): log
i
cal
l
y gr
o
up options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
eeping
r
ev
-
parse: remove re
s
tricti
o
ns on so
m
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John
Keepi
n
g
pull: chan
g
e
t
he description to "integr
a
te" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
pus
h
:
avo
i
d
suggesting "me
r
g
i
ng
"
remote chan
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
e
eping
git-config(
1
)
:
clar
i
fy precedence of
multi
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Joh
n
Keeping
git-
c
onfig: u
p
date doc for --get with multipl
e
va
l
u
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion:
learn abo
u
t --man
-
path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn Keeping
completion: handle unstuck f
o
rm
o
f base
gi
t
o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
hn
K
eepi
n
g
fast-import
:
allow moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
pin
g
f
a
st-impo
r
t: all
o
w l
s
or fil
e
c
o
py of
the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eep
i
ng
fast
-
import: set
valid mode on root
tree in
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
t9300
:
docume
n
t fast-import
emp
t
y path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
submodule: drop the top-lev
e
l
requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
K
eeping
r
e
v-par
s
e: add --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keepi
n
g
s
u
bmo
d
ule: show full path in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
t7403: add
missing && chainin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
t7403: modern
i
z
e style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t7401:
m
ake indenta
t
ion consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
m
e
rget
o
ol--lib:
r
e
facto
r
{diff
,
me
r
g
e
}
_cmd
l
ogic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
Documentati
o
n/Make
f
i
l
e
: mo
v
e
in
f
odir to be wi
t
h o
t
her
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
Documentation/Makefile:
fi
x
s
pa
c
es aroun
d
assignm
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
h
n
Kee
p
ing
a
dd--interactive: respect d
i
ff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keepin
g
git-gui:
f
i
x
f
ile name
handling with non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John K
e
eping
fetch: don'
t
try to update unf
e
tched
tracki
n
g
refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Ke
e
pi
n
g
diffto
o
l: fix di
r
-diff when
file does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merg
e
-t
r
ee: handl
e
di
r
ectory/e
m
pty
conflict c
o
rrectl
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Ke
e
ping
t/Makefile: don't define TEST_RESULTS_
D
IRECTORY r
e
cursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
co
n
trib/subtree: don't delete
r
emote branches if
split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
ohn Keeping
test
output: re
s
pec
t
$TES
T
_OUTPUT
_
D
I
RECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Kee
p
i
ng
t
/
Makefile: remove
smoke te
s
t t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Kee
p
ing
merg
e
-tree: f
i
x typo
in "both
chan
g
ed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t
/M
a
kefile:
fi
x
re
s
ult handl
i
ng w
i
t
h TEST_OUTP
U
T
_
DIRE
C
TOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
transport-helper: add '
s
igned-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
transp
o
rt-he
l
per: pas
s
--
s
i
gned-tags=w
a
rn-s
t
rip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-expor
t
: add --signed-tags=
w
arn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
t/test-lib
.
s
h
: f
i
x TRASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eeping
mer
g
e
-tr
e
e: d
o
n't
p
rint entries that match "lo
c
al"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Jo
h
n Keeping
gitremo
t
e-helpers(1): clarify refspe
c
behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
h
n
K
e
e
p
ing
submo
d
ule: p
r
i
n
t gr
a
ph output n
e
xt to sub
m
odule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keep
i
n
g
dif
f
: allow unstuck
arguments
w
ith --di
f
f-a
l
gorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
git-
m
e
r
g
e
(1):
do
c
ument diff-algorithm o
p
ti
o
n to
m
erge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
b
isect: avoid signed integer overfl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-break: don'
t
divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t780
0
: ru
n
-
-
dir-diff tests w
i
t
h
and
without
s
ymlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800
:
fix t
e
sts when difftool
uses -
-
no-symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t78
0
0: don
'
t hide gre
p
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
di
f
ftool: do
n
't overwrit
e
modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t
7800: m
o
ve '--s
y
mlinks' specific test to th
e
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Ke
e
ping
merge-tree: fix typo in mer
g
e
-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fread error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Ke
e
p
i
ng
ent
r
y: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
t2003: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
ee
p
ing
dif
f
tool --dir-di
f
f
:
sy
m
link al
l
f
iles matc
h
ing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
diffto
o
l: avoi
d
double
sl
a
shes in sy
m
link ta
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
git-diffto
o
l(1): fix formatting
o
f
-
-
symlink de
s
cription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
ohn Keeping
Rev
e
rt "graph
.
c: mark private file-scope symb
o
l
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn
Keeping
Makefile:
make mandir, htmldir an
d
infodir
absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
re
b
ase -i: respect
core
.
c
ommentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
combine-diff
.
c: teach combined diffs about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff
.
c: use
dif
f
_li
n
e_prefix() wher
e
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
e
p
i
n
g
diff:
a
d
d diff_line_prefix functio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
K
eeping
d
i
ff
.
c
: make cons
t
ant
s
tring arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keep
i
ng
diff:
write pref
i
x
t
o the corr
e
ct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keeping
graph: output
p
a
d
ding for
merge sub
s
equent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
Keeping
t4038:
add te
s
ts
for
"di
f
f --cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eeping
built
i
n/app
l
y: tighten (dis)simi
l
arity
inde
x
par
s
in
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Keeping
mergetool-
-
lib: list user configured
tool
s
in '
-
-
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Keepin
g
Rename {gi
t
- => git}remote
-
helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Jo
h
n Keepi
n
g
Codin
g
Guidelines: add
P
ython codi
n
g g
u
ide
l
ines
commit
|
commitdiff
|
tree
2013-01-28
John K
e
eping
git-remot
e
-testpy: fix path hashing on
P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Keeping
merge
t
ool--lib:
don'
t
cal
l
"exit" in
s
et
u
p_t
o
ol
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next