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
filter-branch: eliminate duplicate mapped parents
2014-05-27
J
o
hn Keeping
comple
t
ion: add missi
n
g
optio
n
s for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
J
oh
n
Kee
p
ing
com
p
l
etion: add a note that merge o
p
tio
n
s are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keeping
builtin/mv: f
i
x out of
b
ou
n
ds write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
builtin/mv: don't use memory a
f
te
r
free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
h
n
K
e
ep
i
ng
utf8
:
u
s
e c
o
rrect type for
v
alues in in
t
erval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keep
i
ng
utf8: fix iconv error
d
et
e
c
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Ke
e
ping
notes-utils: handle boole
a
n
n
otes
.
rewritemode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John
K
ee
p
ing
M
ake
f
i
le: remove redund
a
nt object in
g
i
t-h
t
t
p{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keep
i
ng
pul
l
: suppr
e
s
s
error when no remoter
e
f is f
o
und
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn Keeping
c
ompletion:
handle
-
-[no-
]
fork-point options
to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n
K
eeping
comp
l
etion:
c
omplete
m
erge-ba
s
e
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keep
i
ng
r
e
base: fix f
o
rk-
p
o
i
n
t with zero
a
r
guments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Ke
e
p
ing
re
b
ase:
u
se reflog to find com
m
on base w
i
t
h
upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
pu
l
l: use merg
e
-
base --fork-point when a
p
pro
p
riate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
eeping
peek-remote: r
e
mo
v
e
d
e
precated alias of ls
-
r
emote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-found: remove deprecate
d
com
m
an
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
t
a
r-tree:
r
emove d
e
p
recated comm
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n
Keeping
r
epo-c
o
nfig
:
remov
e
d
e
p
r
e
c
a
t
e
d
alias for "git config
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
J
o
hn Keeping
Docume
n
tation/Makefile:
m
ake As
c
iiDoc dblatex dir
configura
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keepi
n
g
m
e
rge-
r
e
c
ursive: fix
p
arsing of
"
dif
f
-algorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset: handle
s
ubmo
d
ul
e
with trailing
s
lash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n
Keep
i
ng
rm: re-use parse_pa
t
hspec's tra
i
ling-sla
s
h removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John
K
e
eping
g
it
_
re
m
ote_
h
e
l
p
ers: r
e
m
ov
e
little
used Pyth
o
n
library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Keeping
r
ev-par
s
e(1
)
: l
o
gical
l
y group
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse: rem
o
ve re
s
t
rictio
n
s
on some o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pul
l
: change the des
c
ripti
o
n
t
o
"
int
e
grate"
chan
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
eping
push: av
o
i
d suggesting
"
merging" remo
t
e changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-
c
onfig
(
1): clarify precedence of multiple va
l
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
g
i
t-
c
onfig:
u
pdate doc for --get
w
ith multiple
v
al
u
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion: lea
r
n about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
Keepin
g
completion: handle unstuck form of
b
ase
g
it optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn
K
eeping
fast-
i
mport: al
l
ow moving the
r
oot tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn
K
eeping
fast-import: allow ls or
f
i
l
ecopy of the
r
oot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
fast-imp
o
r
t:
s
et
v
alid
mode on root tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
t9300: document fast-import
e
mpty
p
ath
issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submod
u
l
e
: drop th
e
top-level requirem
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
rev-parse:
add --p
r
efix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Keeping
submodule: s
h
ow f
u
ll path in error me
s
sage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
oh
n
Keeping
t7403: add
m
issing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: modernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
t740
1
: ma
k
e indentat
i
o
n consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
mergetool--lib: refactor {diff,merg
e
}_cmd logi
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Kee
p
ing
D
o
c
umen
t
a
t
ion/Makefile: mo
v
e infodir to
be w
i
th othe
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
D
ocumentation/Make
f
ile: fix spaces around
a
s
s
i
g
nm
e
nt
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
eping
add-
-
interactive: re
s
pe
c
t diff
.
algori
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
o
hn Keepin
g
git-g
u
i
:
fix file name handlin
g
wit
h
non-em
p
ty p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keep
i
n
g
fe
t
c
h
: don
'
t try
t
o
u
p
date unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftoo
l
:
f
ix dir
-
diff when fi
l
e does not exist i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keep
i
ng
merg
e
-tree: handle directory/empty confli
c
t correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/M
a
k
e
file: d
o
n't
define TES
T
_RESULTS_DIRECTORY rec
u
rsively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Ke
e
ping
contrib/subtree:
d
o
n
't delete r
e
mote branche
s
if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keepi
n
g
test outpu
t
: res
p
ect
$TEST_OUTPUT_DIRE
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eeping
t/Make
f
ile: remove sm
o
ke test targ
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
ee
p
ing
merge
-
t
ree
:
fix t
y
po in "both changed identical
l
y
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
J
ohn
Keep
i
ng
t/Makefile: fix result handling with TEST_OUTPUT_DIR
E
CTO
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Ke
e
p
i
ng
transport-helper: add '
s
igned-tags
'
capa
b
ility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
t
r
an
s
port-helper: pa
s
s --signed-
t
ags=warn-s
t
rip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keepi
n
g
fast-expor
t
: add --sign
e
d-tags=w
a
rn
-
strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
t/te
s
t
-
li
b
.
sh: fix TRASH_DIRECTORY han
d
l
i
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keep
i
n
g
me
r
ge
-
tree
:
d
on't print entries th
a
t
mat
c
h "loc
a
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Joh
n
Ke
e
ping
g
i
tremote-helpe
r
s(1)
:
c
larify
refsp
e
c behavi
o
ur
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
s
ub
m
odule:
p
rint graph output
n
e
x
t
to
submodul
e
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow unstuck argu
m
ent
s
with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
n
g
git-merge(1): do
c
um
e
nt diff-algorithm option t
o
m
e
rge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
b
i
sect: avoid sign
e
d inte
g
er overfl
o
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
d
i
f
fcore-br
e
ak: don't div
i
de b
y
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t7800: run --dir-diff tests
w
it
h
an
d
w
ith
o
ut symli
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800
:
fix tests when difftool
u
ses
-
-
no-sy
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: don't h
i
de
grep o
u
tput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
d
i
fftool: don't ove
r
write modified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keepi
n
g
t7800:
m
ove '--symlinks'
s
pec
i
fic test
t
o
t
he en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn Ke
e
pin
g
merge-tree: fix
t
ypo in merge-tree
.
c::unreso
l
ved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c
:
f
i
x
f
read er
r
or handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix filte
r
looku
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
t
2
0
03: modernize s
t
yl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool --
d
i
r
-d
i
ff:
symlink all files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
i
n
g
d
ifftool: avo
i
d
d
oubl
e
slas
h
es in sym
l
ink tar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
g
i
t-difftool(1): fix formatting
o
f
-
-
s
y
m
l
i
n
k
description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c: mark
pr
i
vate f
i
le-s
c
op
e
sy
m
bols
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
K
eep
i
ng
M
a
kefile: make mandir, htmldi
r
and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
r
ebas
e
-i:
respect
c
ore
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
combine
-
di
f
f
.
c: teach c
o
mbined diffs
a
bout line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
d
i
f
f
.
c: use diff_line_prefix() where app
l
ic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
diff: add
diff_li
n
e_
p
ref
i
x fun
c
t
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keep
i
ng
diff
.
c: m
a
k
e
con
s
tant strin
g
arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: write prefix to
t
he correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn Keeping
graph: ou
t
p
u
t padding for merge subsequent
pare
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John K
e
ep
i
ng
t4038: add tes
t
s for "
d
iff --cc --raw <
t
rees
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keepi
n
g
bu
i
ltin/a
p
ply: tighten (dis)s
i
milarity
i
ndex pa
r
sing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
me
r
getool--
l
i
b
: list user c
o
nfigured to
o
ls
i
n
'
--t
o
ol
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Joh
n
K
e
e
p
i
ng
Rename {g
i
t- => git}rem
o
te-
h
elpe
r
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Codi
n
gGu
i
d
eline
s
:
a
dd Py
t
h
o
n coding g
u
idelines
commit
|
commitdiff
|
tree
2013-01-28
J
o
h
n
K
eeping
git-remote-testpy: fix
pa
t
h hashi
n
g on
P
y
t
hon
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
ohn
Keepin
g
m
erg
e
tool-
-
lib
:
d
o
n't call
"
e
x
it" i
n
se
t
up_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-difftool:
u
se git
-
mergetool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-merg
e
tool:
d
o
n't
hardcode '
m
ergetool' in show_t
o
ol_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mer
g
eto
o
l: remove redundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n K
e
eping
git-mergetool:
m
ove s
h
ow_
t
ool_
h
elp to
mergetool
-
-lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
gi
t
-re
m
ote-testpy: call p
r
i
nt as
a fu
n
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Ke
e
p
i
n
g
git
-
remote-
t
e
stp
y
:
don'
t
do u
n
buf
f
ered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next