repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Sync with 2.0.4
2014-07-22
Joh
n
Keepi
n
g
c
ompletion: complete `git p
u
sh --force-with-
l
ease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John
Keeping
completion: add some missing o
p
tions to `g
i
t
p
u
sh`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
completion: comple
t
e "un
s
tuc
k
" `git p
u
sh -
-
recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keep
i
ng
r
e
base: omi
t
p
atch-id
e
ntical c
o
m
m
i
ts with --for
k
-
p
oint
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
Jo
h
n K
e
epi
n
g
re
b
ase-
-
a
m: use --ch
e
r
ry-pic
k
instead
o
f --ig
n
or
e
-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
comp
l
etion: add missing
op
t
io
n
s for gi
t
-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Joh
n
Keeping
compl
e
tion: a
d
d a note that merge op
t
ions
are s
h
ared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
J
o
h
n Kee
p
ing
buil
t
in/mv: fix out
of bounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
b
uiltin/m
v
: don't us
e
m
e
m
ory after fr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8:
u
se correct type for
v
a
l
u
es in interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn
Keeping
utf8: fix ico
n
v
error detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
h
n K
e
eping
note
s
-utils
:
h
a
ndle boolea
n
notes
.
rewritemode correctl
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
M
a
k
e
file:
r
emove redundant objec
t
in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
Jo
h
n Keeping
p
ull: suppre
s
s
e
r
r
or wh
e
n no remote
r
ef
i
s found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completion: handle
-
-[no-]f
o
rk-point optio
n
s to
g
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
ee
p
ing
c
o
mpl
e
tion:
com
p
lete merge-base opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebase: f
i
x
f
ork-p
o
int with z
e
ro a
r
g
u
ment
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John
K
eeping
rebase: use ref
l
og to
find com
m
on ba
s
e with upst
r
eam
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
Jo
h
n
Keeping
pull:
u
se merge-base --fork-poin
t
when
a
ppropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
K
e
eping
peek-
r
emote: remove de
p
recated a
l
i
as
of
l
s-r
e
m
o
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
e
p
ing
lost-
f
o
u
nd: remove deprec
a
ted com
m
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
tar-tree: remove depreca
t
e
d
c
ommand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
r
e
p
o
-co
n
fi
g
:
re
m
ove deprecated alias fo
r
"g
i
t config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keepin
g
Documen
t
ation/
M
a
k
efil
e
: make A
s
ciiDoc dblatex dir con
f
igur
a
b
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merg
e
-recursive: fix parsin
g
of
"diff-algorith
m
"
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Keeping
re
s
et: hand
l
e submodule with trailing sla
s
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n Keeping
rm: re-use parse_
p
athsp
e
c
'
s trailing-sla
s
h removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Kee
p
ing
g
it_r
e
m
ote_help
e
rs: re
m
o
v
e
l
ittle used Python
l
i
b
rary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
e
eping
rev-pars
e
(1
)
: logical
l
y group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
J
ohn K
e
eping
rev-pa
r
se:
r
emo
v
e restric
t
i
o
ns on
some opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John
K
eeping
pull: cha
n
ge t
h
e
description
to "integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Jo
h
n
K
e
eping
push: avo
i
d s
u
ggesting "mergi
n
g"
remote cha
n
g
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
e
eping
git-config(
1
): clarify p
r
ecedence
o
f mu
l
t
i
ple va
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
Jo
h
n Keeping
git-co
n
fig: u
p
date doc for --get with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn
K
eepi
n
g
completio
n
:
learn a
b
out -
-
man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn
K
eep
i
n
g
completion: handle unstuck form
of base git
op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
fast-
i
mp
o
rt:
allo
w
moving the roo
t
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
ast-i
m
port: allow ls or filecop
y
of the
r
oot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
fast-import: se
t
val
i
d
mode o
n
root t
r
ee
i
n
"ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t930
0
:
document fast-import empty pa
t
h iss
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
subm
o
dule:
d
rop
t
he top-le
v
el re
q
uirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
rev-pa
r
se: add --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
e
e
p
i
n
g
subm
o
d
ule: show full
p
ath in error m
e
s
s
age
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn
K
eep
i
ng
t7403: add m
i
ssing && cha
i
n
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t7403: modernize
st
y
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t
7
401
:
m
ake indentation consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
e
e
ping
m
e
rgetool--lib:
re
f
ac
t
or {d
i
f
f
,merge}_cmd lo
g
ic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
ep
i
ng
Docu
m
entation/Makefile: move i
n
fodir t
o
b
e
wit
h
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentation/M
a
kefile: fix spac
e
s a
r
o
u
nd assi
g
nments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keepin
g
a
dd--
i
nteract
i
ve
:
r
e
spect
diff
.
a
lgorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
o
hn Kee
p
ing
git-gui
:
fix
fil
e
name hand
l
ing with non-empty pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch:
d
o
n't
try to update
u
nfetche
d
track
i
ng refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
ohn Kee
p
ing
di
f
ftool: fi
x
dir-diff when file does not exis
t
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keepi
n
g
merge-tree: han
d
le di
r
e
ctor
y
/
e
mpty
con
f
lict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keepin
g
t/Ma
k
efile: don't de
f
ine TEST_RESULTS
_
D
IRECT
O
RY
rec
u
rsively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contr
i
b/subtree: don't delete remote bra
n
ches
if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Ke
e
ping
test output: respect $TEST_OUT
P
UT_DIRECTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Ke
e
p
i
ng
t/Make
f
ile: remove smoke
test targ
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
h
n
Keeping
merge-tree:
f
i
x
typo in "b
o
th changed identica
l
ly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Ke
e
ping
t/M
a
kefile: fi
x
r
esult hand
l
ing wit
h
T
E
ST_O
U
TPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tran
s
por
t
-he
l
per
:
ad
d
'si
g
ned-tags'
c
apabi
l
i
t
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
h
n
Keeping
transport-hel
p
e
r: pas
s
--s
i
gn
e
d-tags=warn-strip
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
n
g
fast-export: add
-
-signed-tags=warn
-
strip 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
h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keepi
n
g
merge-
t
r
e
e: don'
t
print ent
r
i
es that ma
t
c
h
"local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremo
t
e-h
e
lpers(1): clari
f
y
r
efspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
s
u
bmodul
e
:
print graph
o
ut
p
ut nex
t
to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
e
e
pin
g
diff
:
al
l
o
w
u
nstuc
k
arguments with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
e
eping
g
it
-
m
erge(1
)
: document diff-algorithm optio
n
t
o
mer
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eeping
bisec
t
:
avoid signed integer ove
r
flo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
eping
diff
c
o
re-break
:
d
o
n't divi
d
e by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n K
e
eping
t7800:
r
u
n --dir-diff tes
t
s wi
t
h and with
o
ut symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800: fix t
e
sts when difftool uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Kee
p
ing
t
7
8
0
0: don't hide grep outp
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
difftool: d
o
n't
o
v
e
rwrite m
o
difie
d
files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t
7800: move '-
-
symlinks' specific t
e
st to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge
-
tr
e
e: fix ty
p
o in merge-tree
.
c
:
:unres
o
lved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
eping
re
f
s
.
c: fix
fread error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Kee
p
ing
entry: fix filter
l
ookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
t2003: mo
d
ernize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
ifftool --
d
ir-d
i
f
f: sy
m
link
a
ll files m
a
tching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
d
ifftool: avoid do
u
ble sla
s
h
es in symlink targ
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Ke
e
pin
g
g
i
t-
d
ifftoo
l
(1): fix formatting of --symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Joh
n
Keeping
Revert "graph
.
c
: mark private fil
e
-scop
e
symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
K
ee
p
ing
M
ake
f
ile
:
make mandir, htmldir an
d
infod
i
r absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
r
e
bas
e
-i: respect core
.
c
ommentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
co
m
b
i
ne-diff
.
c: teach comb
i
ned diffs about li
n
e prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Ke
e
ping
diff
.
c
:
u
se diff_line_prefix() where appl
i
cable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff:
a
dd dif
f
_line_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make constant string arguments
const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
diff: wr
i
te prefix to the correct fi
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Jo
h
n
K
eeping
g
r
a
p
h: outp
u
t
paddi
n
g for
merge subsequen
t
p
a
rents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
hn Keep
i
ng
t4038: add tests f
o
r "diff --
c
c --
r
aw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eeping
buil
t
in/
a
pply: tighte
n
(dis)s
i
milarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetoo
l
--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 Keeping
R
ename
{
g
i
t
- =
>
git
}
remote-helpers
.
t
x
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGu
i
delines: add Python coding guide
l
in
e
s
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
ping
gi
t
-remote-testpy: fix path ha
s
hing
on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
K
eepin
g
mergetool--l
i
b: don
'
t call "e
x
it"
in setup_too
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-dif
f
tool:
u
se git-merg
e
t
o
ol
-
-li
b
f
o
r
"
-
-to
o
l-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next