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
Merge branch 'jk/init-core-worktree-at-root' into maint
2015-03-31
John K
e
e
p
ing
streaming
.
c: f
i
x a mem
l
e
a
k
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
o
hn
K
eeping
compl
e
t
i
o
n: com
p
lete `git push
--
f
orce-with-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
Joh
n
Kee
p
ing
completion: add some mi
s
sing options to `git p
u
sh`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John Keeping
completion: complete "unstuck" `git push
--
r
ecur
s
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
Jo
h
n Keeping
rebase:
o
m
it patch-
i
d
e
n
t
ical commi
t
s with --for
k
-point
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keeping
rebase--am: use -
-
cherry-pick ins
t
ead o
f
--
i
gnore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
c
ompletion: add missing
o
p
tions f
o
r git-merg
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Kee
p
in
g
completion: add a note th
a
t
m
erge
o
ptions are share
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
builtin/mv: fix
o
ut of
b
ounds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
builtin/mv:
d
on't use memory
a
fter free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
i
ng
utf8: use correct type for v
a
l
u
e
s
in inter
v
al table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
utf8: fi
x
ico
n
v error detection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n
Ke
e
pin
g
notes-uti
l
s:
h
and
l
e
boolean
notes
.
r
ewrit
e
mode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John
Keeping
Makefile:
r
e
move redundan
t
o
b
ject in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keeping
pull:
s
uppres
s
error when n
o
re
m
o
teref is fo
u
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n
K
e
eping
completion: handl
e
--[no-]fork-
p
oint options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John K
e
eping
com
p
l
e
tion: complete merge-base
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
r
e
b
ase: fix for
k
-po
i
nt with zero argu
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Ke
e
p
ing
rebase: use reflog to find common ba
s
e
w
ith upstre
a
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
ohn Keeping
pull: use merge-b
a
se --fork-point when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Kee
p
ing
peek-remote:
remove deprecated alias of ls-rem
o
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
l
ost-
f
ound:
r
e
m
ov
e
depr
e
cated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
e
eping
tar-tree:
rem
o
ve deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
repo
-
c
o
n
fig: remove de
p
recated alias
f
or "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentatio
n
/Makefile: ma
k
e
As
c
iiDo
c
d
b
latex dir config
u
ra
b
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-r
e
cu
r
siv
e
:
f
ix parsing of "diff-a
l
gori
t
hm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
ohn Keepi
n
g
reset: handl
e
s
u
bmodule
w
ith trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
oh
n
K
eeping
rm: re-use parse
_
paths
p
ec
'
s tr
a
ilin
g
-slas
h
removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n
K
eeping
g
it_remote_h
e
lpers: remov
e
little
used P
y
t
hon library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Keeping
rev-par
s
e(
1
):
l
ogicall
y
grou
p
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keep
i
ng
rev-parse: re
m
ov
e
r
e
strictions on so
m
e options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keep
i
ng
p
u
ll:
change t
h
e description to "integ
r
ate" chang
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keepi
n
g
push: avoid s
u
ggesti
n
g "m
e
rging"
r
e
mote cha
n
ges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
e
pi
n
g
gi
t
-co
n
fig(1): clarify
pre
c
ede
n
ce of multip
l
e v
a
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keep
i
ng
g
it-c
o
nf
i
g: update
d
oc f
o
r
--g
e
t with multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John K
e
e
ping
com
p
letion: learn abo
u
t --ma
n
-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
compl
e
tion:
h
andle unstuck form of base git
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
fa
s
t
-
import: allow
m
oving the root tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n K
e
eping
fast-import: a
l
low ls or fi
l
ecopy of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keepi
n
g
fast-import: se
t
valid mode on
roo
t
tr
e
e in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t9300: doc
u
ment fast-import em
p
ty
path is
s
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: drop
the
top
-
level requireme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
rev
-
p
arse: add --pref
i
x
optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
s
u
bmodule
:
show f
u
ll p
a
th in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
t7403: add m
i
ss
i
ng
&&
c
h
aining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
7403:
m
o
dernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
t7401: make indentation consiste
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
epin
g
m
e
r
g
e
t
o
ol--lib: refactor {diff,m
e
r
g
e}_
c
md l
o
gi
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
Documenta
t
ion/Mak
e
file: move infodi
r
to be with ot
h
er
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentatio
n
/Ma
k
e
f
ile: f
i
x spaces around
a
ssignme
n
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
eping
add
-
-i
n
teracti
v
e
: respect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
o
hn Keeping
g
i
t-gui: fix file name handling with non-emp
t
y prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
J
o
hn
Keeping
fetch: don't
t
r
y to update unfetched tracki
n
g r
e
fs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftool:
fix
dir-diff
w
hen f
i
le does
n
ot exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Ke
e
ping
merge-tree: handle direc
t
ory/empty
c
onflict
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
Joh
n
Keeping
t/Makef
i
le
:
don't define TES
T
_RESULTS_DIRE
C
TORY r
e
c
u
rsi
v
el
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
c
o
ntrib/subtree:
d
on't delete rem
o
te
branches
i
f
sp
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
K
e
e
p
in
g
tes
t
output: respect $TE
S
T_OUTPUT_DIREC
T
OR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Keeping
t/Makefile:
remov
e
smoke
tes
t
targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Keeping
merge-tree
:
fix ty
p
o in "both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
Joh
n
Keepin
g
t/Ma
k
efile: fix resu
l
t han
d
l
i
ng
wi
t
h
TEST_OUTPUT_
D
IRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
transport-helper: add 'signed-tags' cap
a
bility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
transp
o
r
t
-helper: pass --signed-tag
s
=
wa
r
n-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fa
s
t-export: add --signed-tag
s
=w
a
rn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
i
n
g
t/test-li
b
.
sh
:
fix TRASH_
D
IRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keep
i
ng
m
e
rge-tree: do
n
't print
e
ntries
t
h
at match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Joh
n
Keeping
gitremote
-
helpers(1): cla
r
ify
r
efspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
subm
o
dul
e
:
p
rin
t
graph output next to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
e
e
p
i
ng
diff: all
o
w
unstuck ar
g
uments
wit
h
--
d
i
f
f-alg
o
rithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-me
r
g
e(1): do
c
u
ment diff-
a
l
g
orith
m
o
pt
i
on to merg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid
s
igne
d
in
t
eger ov
e
rflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n Keep
i
n
g
dif
f
core-br
e
a
k: don't divide b
y
z
e
ro
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800: run --
d
ir-d
i
ff tests with and
wit
h
ou
t
s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800: fix tes
t
s when diff
t
ool
u
ses
-
-no-sym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
epin
g
t78
0
0: d
o
n't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
pi
n
g
difftool:
d
on't overwrite modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Ke
e
ping
t7800
:
move '--
s
ymlin
k
s' sp
e
cific t
e
st
to the e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John K
e
eping
merge
-
tr
e
e: fix typo i
n
m
e
rg
e
-tre
e
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fread error handl
i
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fi
x
filter
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t
2
003: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
difftool --dir
-
diff: symlink all files match
i
n
g
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
difftool: avoid dou
b
le slashes in symlink targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
g
i
t
-difftool(1
)
: f
i
x
f
ormat
t
in
g
of --symlink
d
escription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
R
evert "graph
.
c: mark private file-s
c
ope s
y
m
bols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Joh
n
Keeping
Makefile: make ma
n
di
r
, htmldir and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Kee
p
ing
rebase -
i
: respect core
.
c
o
mmentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
combine-diff
.
c: te
a
ch
c
omb
i
n
e
d diffs
a
bout line
p
refi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn
K
e
epi
n
g
diff
.
c: use diff_l
i
ne_prefix() whe
r
e ap
p
licable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add dif
f
_lin
e
_p
r
efix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
dif
f
.
c
:
make constant string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
di
f
f: writ
e
prefix to the corr
e
ct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: ou
t
put pa
d
d
i
ng for m
e
r
g
e subsequent
p
arent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t
4038: add tests for "d
i
ff --cc --raw <tr
e
es>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn
K
eeping
builtin
/
apply
:
tighte
n
(dis)simila
r
ity
i
ndex parsi
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool--lib:
l
i
st user
c
onfigured tools in
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John K
e
eping
Renam
e
{git- => git
}
remote-hel
p
ers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
ohn Kee
p
ing
Co
d
ingGuidelines: a
d
d Python codin
g
guideli
n
es
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
g
i
t-re
m
ot
e
-testpy: fi
x
path
h
as
h
ing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
merget
o
ol--lib:
don't call "exit
"
in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next