repo.or.cz
/
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 'km/avoid-bs-in-shell-glob' into maint
2014-03-11
John Keeping
b
u
i
ltin/mv: fix
o
u
t
of bounds wri
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
Joh
n
K
eeping
Makefile: remove r
e
dundan
t
object in
git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
o
hn Keepi
n
g
pull: suppr
e
ss error when no rem
o
teref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Joh
n
Keeping
completion: handle
-
-
[n
o
-]for
k
-point
options to
git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
K
e
ep
i
ng
complet
i
on
:
comp
l
ete
m
erge-base options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Kee
p
ing
r
ebase: fix fork-point
w
ith zero arg
u
ments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
Joh
n
Keeping
rebase: use reflog
to find common
b
ase wit
h
upstre
a
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Kee
p
i
n
g
pull: use merge-
b
a
s
e -
-
fork-point when appropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek
-
remote:
r
e
m
ove
d
e
p
r
ecated alias of l
s
-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keep
i
ng
lost-found
:
remove deprecate
d
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keeping
t
a
r-tr
e
e: remove depreca
t
e
d comm
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn
K
eep
i
ng
repo-config: remove depreca
t
ed a
l
ias for "git co
n
fig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentatio
n
/Makef
i
le: make
A
scii
D
oc
d
bl
a
tex dir c
o
nfig
u
r
ab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John
Keeping
m
erge-recurs
i
ve: fix pa
r
sin
g
of "diff-
a
lgorithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset: h
a
n
dle sub
m
odu
l
e with
tra
i
ling sla
s
h
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n Keeping
rm: re-use parse_p
a
thspec's
t
r
ailing
-
slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_remote_
h
elpers:
remove litt
l
e
u
sed Python library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Ke
e
p
ing
rev-par
s
e(1): logically
g
ro
u
p options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
Jo
h
n
K
eeping
rev-
p
ar
s
e
: remove restrictions on some op
t
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
oh
n
Keepin
g
pull: ch
a
nge th
e
description to "integrate" change
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
push: avoid s
u
ggesting "
m
erging" remote
c
h
anges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Ke
e
ping
git-co
n
fig(1):
c
l
a
r
i
fy prece
d
e
nce of multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John
K
eeping
git
-
config: update
d
oc for
-
-g
e
t
with mu
l
tiple
v
a
lues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
com
p
letion:
learn
about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
c
omp
l
etion: handle unstuc
k
form of base git opt
i
ons
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import:
allow movi
n
g the
r
oot t
r
ee
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn Keepin
g
f
ast-impo
r
t: allow
ls
o
r
filecopy of the ro
o
t tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
fast-impo
r
t:
set valid mode
on root
t
ree in "
l
s"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn
K
e
ep
i
ng
t930
0
: document
fast-impor
t
empty
path
is
s
ues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keeping
submodul
e
: dr
o
p
the t
o
p
-
level
requ
i
remen
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-p
a
r
se
:
add --p
r
efix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submo
d
ule:
s
how full
p
ath in error mes
s
age
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
K
e
ep
i
ng
t74
0
3:
a
d
d mis
s
ing && c
h
ainin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
t
7
403: modernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401
:
m
a
k
e
ind
e
ntation consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
merge
t
o
ol
-
-lib: refact
o
r {diff,merge}
_
cmd
logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
D
o
c
u
mentatio
n
/Makef
i
le:
move
i
nfod
i
r to
be with
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
h
n Keeping
Doc
u
mentation/Makef
i
le
:
fix
s
paces aro
u
nd
assignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
oh
n
K
e
e
p
ing
add--intera
c
tive: respect di
f
f
.
algo
r
ithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Jo
h
n Keeping
g
it
-
gui: fix fil
e
name handling with non
-
empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keepin
g
fetc
h
: don't
t
ry t
o
update unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
K
e
eping
diff
t
oo
l
: fix d
i
r-diff
w
h
e
n
file does
not exi
s
t
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keepin
g
m
e
rge-
t
r
e
e:
ha
n
dle
d
irectory/emp
t
y con
f
lict
corr
e
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Makefile: d
o
n't
define TEST_RESULTS_DIRECTORY recursivel
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John
Keeping
contrib/subtree: don't
d
e
let
e
remote branches if spl
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
J
ohn Keeping
test output: res
p
ec
t
$TE
S
T_OUTP
U
T_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eepi
n
g
t/Ma
k
efi
l
e: remove
smo
k
e test target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Ke
e
ping
merge-
t
re
e
:
f
ix typo in
"
both changed
i
dentica
l
l
y"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile: fix result hand
l
i
ng wit
h
TE
S
T_OUTPUT_D
I
RECTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
transp
o
rt-helper: add 'signed-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
transpo
r
t-help
e
r: pass --
s
igned-
t
a
g
s=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Kee
p
ing
fas
t
-exp
o
rt: a
d
d --signed-tag
s
=warn-s
t
ri
p
mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
t
/
t
est-lib
.
sh: fix TRA
S
H_DIRECTO
R
Y
h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't prin
t
entries that
match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John K
e
ep
i
ng
gitremote
-
helpers(
1
): clarify
refspec
b
eh
a
viour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
submodule: print gr
a
p
h output
next to sub
m
odule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: allow unstuck arguments with -
-
diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keepi
n
g
g
i
t-merge
(
1): document diff-algorithm
o
p
tion to m
e
rge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
bisect: avoid
signed int
e
g
er overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n Keeping
diffc
o
re-b
r
eak:
don't
divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t7
8
00:
r
u
n
--
d
ir-diff tests with and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
e
p
ing
t7800: fix te
s
ts
when diff
t
o
o
l
uses --
n
o-syml
i
nks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t78
0
0: don't hi
d
e gr
e
p outpu
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
difftoo
l
:
d
on't overwri
t
e modified
file
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800
:
move
'
--s
y
mlinks'
speci
f
ic test to
t
he end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn Ke
e
ping
m
erge-tree: fix typo in merge
-
tree
.
c::unres
o
lved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
eping
r
e
fs
.
c
:
fix fread error handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
ent
r
y
:
f
i
x
f
i
l
ter looku
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t
2003:
m
odernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
diffto
o
l
--dir-diff: symlink all files
m
atc
h
ing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
difftool: avo
i
d doubl
e
slashe
s
i
n sym
l
ink
t
argets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn
Ke
e
ping
git-difftool(
1
): fix formatting
o
f
--sym
l
ink desc
r
iption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c
:
mark private file-scope sym
b
o
l
s a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Jo
h
n Keep
i
n
g
Makefile: make mand
i
r, h
t
m
l
dir and infodir ab
s
olute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
r
e
base -i: respect core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-diff
.
c: teach combined diffs abou
t
line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
e
ping
diff
.
c:
u
se diff_l
i
ne_prefix
(
)
w
here applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add
d
i
ff_line_pre
f
ix functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
d
iff
.
c: make constant
s
tring argum
e
nts
con
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Ke
e
ping
diff:
w
r
ite prefix
t
o the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Joh
n
Keepin
g
graph:
output padding
f
o
r
merg
e
su
b
s
eque
n
t parent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Kee
p
ing
t4
0
38
:
add tests for "
d
i
f
f
-
-cc --raw
<t
r
ees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John K
e
eping
b
uiltin/apply: ti
g
hten (dis)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keeping
mergetool--lib: list user config
u
red tools in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
h
n
Keeping
Rename
{
git-
=>
g
it}remo
t
e-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingG
u
idelin
e
s: add Python codin
g
guid
e
lines
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
git-remo
t
e-test
p
y:
fix path hashing on Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
m
ergetool--lib: don'
t
call
"exit" in
se
t
up
_
tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-
d
ifft
o
ol: u
s
e
git-merge
t
ool--lib f
o
r "--
t
ool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keep
i
ng
gi
t
-mergetool: don't
h
ardcode 'mer
g
etoo
l
' in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-mergetool: re
m
ove
re
d
u
ndant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool: mov
e
s
how_tool_he
l
p to mergetool
-
-lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
gi
t
-re
m
ote-testpy:
c
a
l
l
print
a
s
a
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
gi
t
-remo
t
e-testpy: do
n
't do
u
nbuf
f
ered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
Keeping
git-remote
-
testpy:
h
a
sh byt
e
s explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
svn-fe: allow svnrdump_sim
.
p
y
to run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keepi
n
g
git
_
re
m
o
te_h
e
lpers: use 2to
3
if
bu
i
ld
i
ng wi
t
h
Pyt
h
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git_re
m
ote_helpers: force rebu
i
ld if
p
ython version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Jo
h
n 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
J
o
hn Keeping
git-for-
e
ach-ref
.
txt:
'
raw'
is a sup
p
orted
d
ate format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next