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 'jn/ignore-doc'
2014-01-17
John Ke
e
ping
p
ull
:
suppress erro
r
when no remote
r
ef is f
o
und
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
ohn Keepi
n
g
c
o
mpletion: han
d
le
-
-[no-]
f
ork-po
i
nt
o
ptions to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Kee
p
ing
completi
o
n: compl
e
te
m
erge-
b
ase optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keep
i
ng
r
e
b
ase: 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
rebase: use r
e
f
log to find common base w
i
th u
p
stream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Ke
e
ping
pull
:
use merge-base --fork-point when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek-remo
t
e
: remove
d
eprecated alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
lost-found:
re
m
ove deprecated co
m
man
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
t
ar
-
tree: re
m
ove depr
e
cated
c
o
m
m
a
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Keeping
repo-con
f
ig: remove depre
c
a
t
e
d alias
f
or "git c
o
n
fi
g
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Joh
n
Ke
e
ping
Documentation/Ma
k
efile
:
m
ak
e
AsciiDo
c
dblate
x
dir
configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
Jo
h
n Keeping
merge-re
c
ursive: f
i
x parsing of "diff-algor
i
thm" opt
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rese
t
: handle submod
u
l
e
with t
r
a
i
ling slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
K
e
ep
i
ng
rm: re-use parse_path
s
pec's trailing-slash remov
a
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keepin
g
gi
t
_r
e
mote_
h
elpers: remo
v
e little used Python librar
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev
-
p
arse(1): logically
g
roup options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Kee
p
i
n
g
r
e
v
-pa
r
se: remove res
t
r
ictio
n
s on some o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: change
t
he description to "integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
pu
s
h: avoid s
u
ggesting "
m
erg
i
ng" remote
c
h
a
nge
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John K
e
eping
gi
t
-c
o
n
f
ig(1): clarify prece
d
ence of m
u
ltiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
J
o
hn Keepin
g
git-c
o
nfig: update doc for --ge
t
wi
t
h
m
ultipl
e
v
alues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
K
eepin
g
c
o
m
pletion:
l
earn
ab
o
ut --man-p
a
th
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John
K
eeping
completion: handle unst
u
ck form of base git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
oh
n
Keeping
fast-import: allo
w
moving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import:
allow
l
s
or f
i
lecopy of the root tre
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
ng
fast-import:
s
et v
a
l
i
d
m
o
d
e on
root
t
ree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
t93
0
0
:
docum
e
n
t
fa
s
t-impo
r
t empty
p
ath
i
ssue
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
submodule
:
drop the top-level re
q
uire
m
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
rev-parse:
add --pr
e
fi
x
opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n K
e
eping
subm
o
dule: show fu
l
l pa
t
h
in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t7403: a
d
d missi
n
g
&
& chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: mode
r
nize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
t740
1
:
make indentatio
n
consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
mergetool--lib
:
refactor
{
diff,me
r
g
e
}
_
cmd lo
g
ic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
Docu
m
entation/Makefile: move
in
f
o
dir to
be with
o
ther
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keepi
n
g
Documentation/Makefile: f
i
x spaces a
r
ound assignme
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John
Keeping
add-
-
inte
r
active:
r
espect diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John
Keeping
g
i
t
-gui: fix file name
h
andling
with non-e
m
pty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John K
e
e
p
i
ng
fetch: don't try
to update
u
n
fetched t
r
ac
k
ing r
e
fs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
d
ifftool: fix dir-dif
f
when
fil
e
does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John K
e
ep
i
ng
mer
g
e-tree: handl
e
directory/empty c
o
nflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keepi
n
g
t/Makef
i
le: don
'
t define TEST_RESULTS
_
DIRECTORY recursiv
e
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib/subtree: don't de
l
ete remo
t
e
branche
s
if sp
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
t
est output: r
e
spect
$
TEST_OUT
P
UT_DIREC
T
ORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/M
a
kefile: rem
o
ve s
m
oke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tree: f
i
x typo in "
b
o
t
h changed identic
a
lly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keepin
g
t/Makefile: fix result handling
with TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
transport-helper: add 'sig
n
ed-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
t
r
ansport-h
e
lper: pass --signed-
t
ags=warn-st
r
ip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fa
s
t-export: add
--s
i
gn
e
d-
t
ags=war
n
-st
r
ip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn
Keeping
t/test
-
lib
.
s
h: fix
TRASH
_
DIRE
C
TORY han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
m
erge-tre
e
: don'
t
print entries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremo
t
e-helpers
(
1): cla
r
ify
r
efspe
c
behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Kee
p
ing
submodule: print gra
p
h
outpu
t
next to submod
u
le log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
i
n
g
di
f
f: allo
w
unstuck a
r
g
uments with --diff-al
g
orithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Ke
e
ping
git-merge(1): documen
t
diff-algorithm
o
ption to me
r
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bi
s
e
c
t: avoid signed int
e
ger
overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Kee
p
ing
diffcore-break:
don'
t
divide by
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keepi
n
g
t7
8
00:
r
u
n --d
i
r-d
i
ff te
s
ts
w
it
h
and without symli
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7800: fix tests whe
n
diffto
o
l uses --n
o
-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keepin
g
t
7
80
0
: don'
t
hide grep outp
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool: don't overwrite modified fi
l
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n Keeping
t780
0
: m
o
v
e
'
-
-symlink
s
' s
p
ecific te
s
t to the 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 me
r
ge-tree
.
c::u
n
re
s
olved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keep
i
n
g
r
e
fs
.
c: fix fread er
r
o
r
h
andling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
p
i
ng
entry: fix f
i
lter
lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
t2003
:
modernize
sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eep
i
ng
difftool --dir-d
i
f
f: syml
i
nk all
f
iles matching th
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eepi
n
g
di
f
ftool: avoid
double slas
h
es in
symlink
t
a
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
git-difftool
(
1): fix formatting of --
s
ymlink des
c
ript
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert
"
graph
.
c
:
mark private fil
e
-scope s
y
mbols a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keepin
g
Makefi
l
e: make mandir, ht
m
l
dir and in
f
o
dir absol
u
te
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
rebase -i: respect core
.
c
o
mmen
t
cha
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
combin
e
-di
f
f
.
c: teach combined
diffs about li
n
e prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
dif
f
.
c:
u
se d
i
ff_lin
e
_prefix(
)
where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff: add diff_line_prefix fun
c
ti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
K
eep
i
ng
dif
f
.
c:
make cons
t
a
nt st
r
ing
a
rguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: write pref
i
x to the correct
f
i
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn Keeping
g
rap
h
: output paddin
g
f
or merge subsequ
e
nt
p
aren
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
Keepi
n
g
t4038: add tests for "diff --cc --r
a
w <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
Kee
p
ing
b
uiltin/appl
y
: tighten (dis)simil
a
ri
t
y
inde
x
p
ars
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
mergetoo
l
--li
b
:
list u
s
e
r
c
onfigured to
o
l
s
in '
-
-
tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
ohn Keeping
Rename {git
-
=> gi
t
}remote-helpers
.
t
x
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Joh
n
Keeping
CodingGuidelin
e
s: add
Pyt
h
on
cod
i
n
g guidelines
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Ke
e
p
ing
git-r
e
mote-testpy: fix p
a
th hashing
on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Kee
p
ing
m
ergetool--lib: don't call "ex
i
t
"
i
n
setu
p
_too
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-difftool: use gi
t
-mergetool--lib for "-
-
tool-he
l
p"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-me
r
g
etool: don't hardcode 'mergetool' in show_too
l
_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-mergetool: remove redund
a
n
t assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-mergetool: mov
e
show_too
l
_he
l
p
t
o mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-
r
emote-testpy
:
c
a
ll
p
rint
a
s a
f
u
n
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-remote
-
t
e
stpy: don'
t
d
o
unb
u
ffered text I/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
epin
g
gi
t
-remote
-
t
estpy
:
hash bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe: allow svnrdump_sim
.
p
y to run
with
Py
t
h
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
_
r
e
mot
e
_
h
e
lpers
:
use 2to3 if
building with Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn
Keepin
g
g
i
t_remot
e
_helpers: force rebu
i
l
d i
f
py
t
hon version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
o
hn K
e
ep
i
ng
g
i
t-cvsimport
.
txt: cvsp
s
-2 is d
e
pre
c
ated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keep
i
n
g
git-for-
e
ach-ref
.
txt
:
'raw' is
a
s
u
pporte
d
date fo
r
ma
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_r
e
mote_
h
elpers: fix input w
h
en
r
unning
under
P
ython
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n K
e
eping
git_re
m
ote_helpe
r
s: a
l
low bui
l
d
i
n
g
w
ith Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next