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 'tb/repack-fix-renames' (early part)
2014-01-27
John Keeping
M
ak
e
file:
r
emove redundant object i
n
git
-
ht
t
p{f
e
tch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John
Kee
p
ing
pull: suppr
e
ss error when no
r
emoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
eeping
compl
e
tion: han
d
le --[no-]fork
-
poi
n
t op
t
i
o
n
s to g
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completion:
complete merge-
b
a
s
e op
t
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
o
hn Keeping
re
b
ase: fix fork-po
i
nt with zero
a
rgum
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
Jo
h
n Keeping
rebase: u
s
e reflog to find common base with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keepi
n
g
pull: use merge-bas
e
--fork-point when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John K
e
epi
n
g
pe
e
k-remote: remo
v
e
d
epre
c
ated alia
s
of ls-re
m
o
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-fo
u
nd:
r
emove deprec
a
ted
c
ommand
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
e
eping
tar-tree
:
remove depre
c
a
ted command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
r
e
p
o
-config: remove dep
r
ecated a
l
ias fo
r
"git con
f
ig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keep
i
ng
Documentation/Makefile: make Ascii
D
oc dblatex dir
c
onfig
u
rable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-r
e
cursive: fix parsing of "diff-algorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Kee
p
ing
re
s
e
t
: handle sub
m
odule with trailing
s
lash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm
:
re-us
e
parse_paths
p
ec's tr
a
ili
n
g-sl
a
sh remova
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Kee
p
ing
git_remote_h
e
lpers:
r
emove little used Python li
b
rary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
r
e
v-parse(1): logicall
y
group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Keeping
rev-parse: rem
o
ve restr
i
ctions on s
o
me options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: change
the descr
i
ption to
"
integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Ke
e
ping
push: avoid
s
u
ggesting "merging" remote changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keep
i
n
g
git-co
n
fig
(
1): clarify prec
e
denc
e
of m
u
ltiple
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Ke
e
ping
git
-
config: upd
a
te doc for --get with
m
u
l
tipl
e
values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn
K
eeping
completion: l
e
arn
a
bout --
m
an-pa
t
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
c
o
mpletion: h
a
ndl
e
unstuck
f
o
rm o
f
base git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keeping
f
ast-impor
t
: allow m
o
ving the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Ke
e
ping
fast-import: all
o
w ls or fil
e
copy of the root
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
a
st-imp
o
rt: set va
l
id mode on root
t
ree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
e
e
ping
t9300:
do
c
u
m
ent fas
t
-import empty path issu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
sub
m
odule: drop the
t
op-level re
q
uirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Kee
p
ing
rev-par
s
e
:
add -
-
prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
submodule: show
f
ull path
i
n err
o
r message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add missing && chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Kee
p
ing
t7403:
modernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
t7401:
m
a
k
e
i
n
d
entation c
o
nsistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool-
-
lib: r
e
f
actor
{diff,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Kee
p
ing
Documentatio
n
/Makefile: m
o
ve infodir to be with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Documentatio
n
/Makefile:
f
i
x s
p
aces
a
round assign
m
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John K
e
eping
add--i
n
teractiv
e
: respect
diff
.
algori
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Keep
i
ng
git-gui: fix file name handlin
g
with non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetc
h
: don't try to
u
p
date unfetched t
r
acking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
Kee
p
i
n
g
difftool: fi
x
dir-diff when file does not
exist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: handle direct
o
r
y
/empty
conf
l
ict
c
orrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Kee
p
ing
t
/Make
f
ile
:
don'
t
d
efine TE
S
T_
R
ESULTS_DIRECTORY recu
r
sively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
ohn Keeping
contrib/subtree
:
don'
t
d
elete remote branches
i
f
s
pli
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
Jo
h
n
Keeping
test output: respec
t
$TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Kee
p
ing
t
/Makefi
l
e:
remov
e
smok
e
te
s
t tar
g
e
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
Keepin
g
merge-tree: fix typo in "both
c
h
a
n
ged identic
a
lly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Ke
e
p
ing
t/Makefil
e
: fix res
u
lt handling w
i
th T
E
ST_OUTPUT_DIREC
T
O
R
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
t
ran
s
p
ort
-
helper: add
'signed
-
tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-hel
p
er: pass
--signed-tags=war
n
-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
fast-expo
r
t: a
d
d --signe
d
-tags
=
warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
K
e
e
ping
t/t
e
st-li
b
.
s
h
: fix TRASH
_
DIRE
C
T
O
RY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keep
i
ng
merge-tree: don't p
r
int
e
ntries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Joh
n
Keeping
gitremote-
h
elpe
r
s(1): clarify refs
p
ec be
h
avi
o
ur
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: pr
i
nt graph
o
utput next to
submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow unstu
c
k ar
g
u
ments with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-mer
g
e(1): document diff-
a
lgorith
m
option to m
e
rg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
bisect:
a
vo
i
d signed i
n
teger overflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Ke
e
p
i
ng
diffco
r
e-b
r
eak
:
d
o
n't divide b
y
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n
K
eeping
t7800: run --di
r
-diff
tests
with a
n
d
without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t
7
8
00: fix
t
ests when di
f
f
tool uses
-
-no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keepi
n
g
t7800: don't hide gre
p
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
difftoo
l
: do
n
't ove
r
write mod
i
fied
fi
l
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7800:
m
ove '--syml
i
nks' specific test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
K
e
e
p
ing
merg
e
-tree: fix typ
o
in merge-tree
.
c::unreso
l
ve
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Kee
p
ing
refs
.
c: fi
x
fre
a
d error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
entry: fix fil
t
er l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
t20
0
3
: modernize sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
difftool -
-
di
r
-diff: symlink all files
matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
difftool: avoid do
u
ble sl
a
s
hes in sym
l
ink t
a
rgets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1)
:
fix formatti
n
g of --
s
y
ml
i
nk description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "g
r
aph
.
c: mark
p
rivate file-scope
s
ymbols a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
Keeping
Make
f
ile: make mandir, ht
m
ldir and i
n
fodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
K
eeping
rebas
e
-
i
:
respect core
.
co
m
m
entchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
combine
-
dif
f
.
c:
t
e
ach combined d
i
ffs about li
n
e prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
f
f
.
c: u
s
e di
f
f
_line_pre
f
ix() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
dif
f
: add di
f
f_line_prefix
f
unction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
eping
diff
.
c: m
a
ke constant st
r
ing
a
rgum
e
nts const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
diff: wri
t
e pre
f
ix to th
e
corre
c
t file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
oh
n
K
eepi
n
g
gr
a
p
h
: output padding for merge subse
q
uent pa
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Ke
e
ping
t4038: add
tes
t
s
f
or "diff --cc --raw <tre
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
b
u
iltin/ap
p
ly: tig
h
ten (dis)
s
im
i
larity index par
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
K
e
eping
mergetool--lib
:
list
user c
o
n
f
i
gured
tools
in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git
-
=> git}r
e
mote-
h
el
p
ers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
K
e
eping
CodingG
u
idelines: add Python coding g
u
idelin
e
s
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
p
i
ng
git-remote-tes
t
py
:
fix path hash
i
ng on P
y
th
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Keeping
mergetool
-
-lib:
don'
t
call
"
exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-difft
o
ol: use git-me
r
getool--lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
Keeping
git-mergetool:
d
on't hard
c
ode 'merget
o
ol' in
sh
o
w_tool_hel
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eep
i
ng
git-mer
g
etool: remove redundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git
-
mergetoo
l
:
m
ove show_too
l
_help to merget
o
ol
-
-l
i
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-r
e
mote
-
t
es
t
py:
call print
as a functio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-re
m
ote-test
p
y: don'
t
do
unb
u
ffered
tex
t
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-re
m
ot
e
-test
p
y: hash bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
svn-fe: allow sv
n
rdump
_
s
i
m
.
py to ru
n
with
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git_re
m
ote_helpers: use 2to3
if building
wi
t
h P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
Ke
e
ping
git_remote_h
e
lpers: force rebui
l
d if
p
yt
h
on version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
g
i
t-cvsimport
.
txt: cvsps-2
is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John
K
eeping
gi
t
-for-each-ref
.
txt: 'raw' is
a supp
o
rted date
f
orm
a
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
o
hn Keeping
git_remot
e
_helpers: f
i
x in
p
u
t
when running under
Pyth
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next