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 'tf/maint-doc-push'
2014-07-22
J
o
h
n Keep
i
n
g
com
p
letion:
comp
l
ete `git
push --force-with-lease=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John
K
ee
p
ing
compl
e
tion: add
s
ome missing option
s
to `
g
it push`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John K
e
eping
complet
i
on: comp
l
ete "unst
u
ck" `git push --
r
e
c
ur
s
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John Keeping
rebase:
o
m
it p
a
t
c
h-id
e
nt
i
cal commits
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 instead of --
i
gnore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
Joh
n
Keeping
completio
n
:
add missi
n
g o
p
t
ions for
g
it-me
r
ge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Kee
p
ing
compl
e
tion: ad
d
a n
o
t
e
that merge op
t
ions ar
e
shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
builtin/mv:
fix out of b
o
unds
w
rite
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
i
ng
builtin/mv: don
'
t us
e
m
emory afte
r
f
ree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf
8
: u
s
e co
r
rect
ty
p
e for values in
interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
h
n Keeping
utf
8
: fix iconv error
det
e
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
notes-utils: handle
b
o
o
lea
n
note
s
.
rewritemode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
J
o
hn Keeping
Makefile
:
remove redu
n
d
a
nt o
b
ject in git-
h
ttp{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Kee
p
ing
p
ull: sup
p
ress er
r
or when
no
r
emoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John K
e
ep
i
ng
completion:
h
a
n
dle --[no-]for
k
-
point options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n Keepin
g
comple
t
ion: com
p
lete merge-ba
s
e optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebas
e
: fix fork-point with ze
r
o arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
r
ebase: u
s
e reflog to find common b
a
s
e wit
h
ups
t
r
eam
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John
Keeping
pull: use m
e
rge-
b
a
se --fork-point
w
hen app
r
opriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
oh
n
Keeping
peek-remote
:
remov
e
deprecated alias
of ls-rem
o
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost
-
foun
d
: rem
o
ve deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tr
e
e: remove deprecate
d
comman
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keepin
g
r
e
po-config
:
remove dep
r
ecat
e
d alia
s
for "git con
f
ig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keep
i
ng
Documentat
i
on/Mak
e
f
ile: make AsciiDoc
d
b
latex dir configu
r
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
o
hn Keeping
merge-recursive: f
i
x
parsing of "diff-algori
t
hm" op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
ohn K
e
eping
rese
t
: ha
n
dle s
u
bmodu
l
e with trailin
g
slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn Kee
p
in
g
rm
:
re-use parse_pa
t
hspec's t
r
ailing-slash remo
v
al
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
o
hn Keeping
git_remo
t
e_hel
p
ers: remove li
t
t
l
e
used Python l
i
br
a
ry
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
pin
g
re
v
-parse(1): logically group
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keepin
g
rev-parse:
re
m
ove restricti
o
n
s on some op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: chan
g
e the descri
p
tion to "i
n
t
egrat
e
"
c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avoid suggesting
"merging" remote change
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-
c
onfig(1):
c
larify
precedence o
f
multiple
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
o
hn Keepi
n
g
g
i
t
-
config: update d
o
c for --ge
t
with multi
p
le va
l
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
complet
i
on: learn abou
t
--man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Keeping
completion:
handle
u
nstuck
form of base git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-im
p
ort: all
o
w movi
n
g the
r
oot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
ng
fast
-
impo
r
t: a
l
l
o
w ls or filecopy of the root
t
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
fast-impo
r
t:
se
t
valid mode on
r
oot tree in "
l
s"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keeping
t
9
30
0
: docu
m
ent
f
a
s
t-import empty path issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keepin
g
s
u
bmodule: drop the
t
o
p-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
r
ev-parse: ad
d
--p
r
efix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submod
u
le: show
f
ull
path in error me
s
sage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keepin
g
t7403: add m
i
s
s
i
n
g && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
Keepin
g
t7403: mod
e
rnize s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t74
0
1: make
indent
a
tion c
o
nsistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool
-
-
l
ib: r
e
factor {diff,merge}_cmd lo
g
ic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
Documen
t
ation/Makefile: move infodir to be w
i
th other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
Documentation/Make
f
ile: fix spaces around assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
o
h
n Keeping
add--interactive: respect diff
.
a
l
gorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Joh
n
Keeping
git
-
gui
:
fix file
name handling with non-empty prefi
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Ke
e
ping
f
etch: don't try to
u
pda
t
e unfetched tracking r
e
f
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftoo
l
: fix dir-diff when
f
ile doe
s
not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree
:
handle directory/empty c
o
nflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefile: don'
t
define TEST_RESULTS_DIRECTORY
r
e
c
ursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
Joh
n
Keepin
g
contr
i
b/subtree: don'
t
de
l
ete remote b
r
an
c
hes
if sp
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Jo
h
n Kee
p
i
n
g
test output: respect $TEST_OUTPUT_DIRE
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
e
p
ing
t/Ma
k
efile
:
rem
o
ve smoke t
e
s
t
t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n
Keeping
merge-t
r
ee
:
fi
x
typo in "both
cha
n
ged ide
n
tically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John K
e
eping
t/Makefile
:
fix r
e
s
u
lt ha
n
d
l
ing
with TEST_OUTPUT_
D
IRECTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
transpo
r
t-helper: a
d
d
'
signed-ta
g
s' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
tran
s
por
t
-helper: pass
-
-signed-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
fas
t
-export: add --signed-tags=
w
a
r
n-st
r
ip
m
ode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
t/test-lib
.
sh: fix TRAS
H
_DIRECTORY
h
a
ndli
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eeping
m
e
rg
e
-tree: don't
p
rint entries th
a
t m
a
tch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gi
t
r
e
m
o
te-help
e
rs
(
1): clarif
y
refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keepin
g
submodule: pr
i
n
t graph output ne
x
t to
su
b
module log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eep
i
ng
diff: allow unstuck argume
n
ts with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
eping
git-merge(1): docu
m
ent d
i
ff-algorithm option to me
r
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keep
i
ng
bisect: avoid sig
n
ed integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eeping
d
iffcor
e
-break: don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t
7
8
00
:
run
--dir-
d
i
f
f
tests wit
h
and without
syml
i
nks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800: fix tests when di
f
ftool
uses
--no-
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800: don't hide g
r
ep ou
t
put
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
difftool: do
n
't overwrite mo
d
ifie
d
f
i
les
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800:
mov
e
'--symlinks' sp
e
cific
t
est to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
Keeping
merge
-
tree: fix typo in merg
e
-tree
.
c::unre
s
olved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
eping
refs
.
c: fix fread
error ha
n
dling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
e
n
try:
fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keep
i
ng
t2003:
mod
e
r
niz
e
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n K
e
e
ping
difftool -
-
di
r
-
diff:
s
ymlink all files m
a
tching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
difft
o
ol:
avoid double slas
h
es in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Kee
p
in
g
git-dif
f
tool(1): fix formatting
of --symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
o
hn Keeping
Revert
"graph
.
c
:
mar
k
private file-sco
p
e
s
ymbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Jo
h
n Keeping
Makefi
l
e: make man
d
ir, htmldir and infodir
a
bsolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
reba
s
e -
i
: respect c
o
re
.
c
o
m
mentc
h
ar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
c
o
mbine-d
i
ff
.
c:
te
a
ch com
b
ined dif
f
s abou
t
line p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff
.
c: use diff_line_prefix
(
) where appl
i
cab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Ke
e
p
ing
diff:
a
dd di
f
f_l
i
ne_p
r
efix
f
unct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: make constant st
r
ing
a
r
gument
s
cons
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
diff: w
r
i
t
e p
r
efix to
the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Jo
h
n
K
eeping
graph:
output paddi
n
g fo
r
mer
g
e subs
e
quent
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn Keeping
t4038: add tests for "dif
f
--cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
eep
i
n
g
b
uiltin/apply:
tighten (
d
i
s)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
m
ergetool--lib: list user
c
o
n
figured tool
s
in '--to
o
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
ohn
Keep
i
ng
Rename {git- =
>
git}r
e
mo
t
e-help
e
rs
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keepin
g
Co
d
ingGuidelines: add Pytho
n
coding guidelin
e
s
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
git
-
r
e
mo
t
e-testpy: fi
x
path hashing on Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool--lib: don't ca
l
l "ex
i
t" i
n
setu
p
_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-difftoo
l
: use git-
m
ergetool--
l
ib f
o
r "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next