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
Win32: move main macro to a function
2014-03-11
John Keeping
builtin/m
v
: f
i
x out of boun
d
s write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John Kee
p
ing
Make
f
ile: rem
o
ve r
e
du
n
d
a
nt obj
e
ct in git-http{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
ohn
Kee
p
ing
pull
:
suppres
s
erro
r
when no
r
emoteref
i
s f
o
und
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Kee
p
ing
c
omplet
i
on: ha
n
dl
e
--[no-
]
fork-point
options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
Ke
e
ping
comp
l
etion: comp
l
ete merg
e
-base
o
ption
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
J
oh
n
K
e
epi
n
g
reba
s
e
:
fix fo
r
k
-
point
with zero
a
rgume
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
J
o
h
n K
e
ep
i
ng
re
b
ase:
u
se reflo
g
t
o
find common
b
ase with upstr
e
am
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
ohn
K
e
e
p
i
ng
pull: use me
r
ge-base --
f
ork-point when app
r
opriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
Kee
p
in
g
p
e
ek-remo
t
e: remove depr
e
cated alias of ls-remo
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Jo
h
n Ke
e
ping
lo
s
t-found: remove depr
e
c
ated c
o
mm
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-tree: re
m
ove depreca
t
ed comman
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
re
p
o
-config:
remove de
p
re
c
ate
d
alias for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Do
c
umen
t
a
t
ion/Ma
k
efile: make AsciiDoc dbl
a
tex di
r
c
o
nfigurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
me
r
ge-recursive: fix parsing
o
f "diff-alg
o
r
ithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
reset:
h
andle s
u
bmo
d
ule with trail
i
ng
slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n
K
e
eping
r
m
:
r
e-use parse_path
s
pec's
t
railin
g
-slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
n Keepi
n
g
git
_
remote_he
l
p
e
rs: remove
little used
P
ython l
i
b
ra
r
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Kee
p
ing
re
v
-pars
e
(1)
:
logically group op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
Keeping
rev-par
s
e: re
m
ove restrictions on some op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
o
hn
K
e
eping
pull: ch
a
nge the description to "integrate" ch
a
n
g
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
e
eping
pu
s
h:
a
v
o
id suggesting "
m
er
g
ing" remote c
h
ang
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
Keeping
gi
t
-config(1): clarify pr
e
cedence of multiple value
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-confi
g
: up
d
ate doc
for --get with multi
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completi
o
n: learn about --man
-
path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Ke
e
ping
completion: ha
n
dle unstuc
k
f
o
r
m of
b
as
e
git
o
pt
i
o
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n
K
e
eping
fast-i
m
port: allow mo
v
i
n
g
t
he r
o
ot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
fast-im
p
ort: allow ls or filecopy of the r
o
o
t tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
Keepi
n
g
fas
t
-import: s
e
t valid mode on root tre
e
in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t93
0
0: document f
a
st-import empty p
a
th issu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: d
r
op the top-level r
e
quirem
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
rev-parse
:
add --prefix optio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodul
e
: show
f
ull p
a
th in er
r
or message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
t7403: add missing &
&
c
hain
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
t7403: modern
i
ze s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keeping
t7401:
make indentation consis
t
en
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keepi
n
g
mergetool--
l
ib:
re
f
actor
{
d
iff,merge}_cm
d
lo
g
ic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
e
p
ing
D
o
c
umentation/Mak
e
file: move infodir to
b
e
with othe
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
D
o
cum
e
n
t
a
t
ion
/
Makefile: fix spaces
around
assignm
e
n
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
John Keeping
a
d
d-
-
interacti
v
e: respe
c
t diff
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John Ke
e
p
i
ng
g
it-gui: fi
x
file name handling
w
ith n
o
n-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John K
e
ep
i
n
g
fetch
:
don'
t
t
r
y to upda
t
e unfetc
h
ed tr
a
cki
n
g r
e
fs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keep
i
n
g
difftool: fix dir-diff when file does
n
ot e
x
ist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n
Keeping
m
e
rge-
t
ree: ha
n
dle directory/empty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Ma
k
e
f
ile: don't
define TEST_RESULTS_DIRECTORY recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib/su
b
tree:
don't
d
elete
r
em
o
te branches i
f
split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John
Keepi
n
g
te
s
t output: respec
t
$TEST_OUTPUT_D
I
RE
C
TORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile:
r
emove
s
mok
e
test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Keeping
me
r
ge-tree: fix t
y
po in "both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Mak
e
file: fix result handling
w
ith TE
S
T_OUTPUT_DIRECTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eepi
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
o
h
n K
e
eping
transport-helper: pass -
-
signed-tags=warn-s
t
rip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
f
ast-export:
a
dd --signed-tags=wa
r
n-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
eping
t/test-lib
.
sh: fix TRAS
H
_
DIRECTORY handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n Keeping
m
erge-tree: don't print entr
i
es
t
h
at ma
t
ch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
K
eeping
gi
t
r
e
mote-helpers(1):
cla
r
ify
refsp
e
c
be
h
av
i
o
u
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn K
e
e
p
i
ng
s
u
bmodule: print
g
raph output next to submodule l
o
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keeping
diff:
allow unstuck arguments wi
t
h --diff-
a
lgorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Kee
p
ing
gi
t
-merge(1)
:
document di
f
f-algorithm o
p
tion to
m
e
rge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bisect: avoid signed
integer over
f
lo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Kee
p
i
ng
diffcore-
b
reak: don't
d
ivide by z
e
r
o
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keep
i
ng
t7800: run --dir-diff tests with and
witho
u
t
sy
m
l
i
nks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800: fix tests when difftool
use
s
--
n
o-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keepin
g
t
7
800: don't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
difftool: don't overwrite mo
d
i
f
i
ed files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Ke
e
p
i
ng
t7800: m
o
ve '--symlinks' specific
test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Ke
e
ping
m
e
rge-tree: fix typo
i
n merge-tree
.
c:
:
un
r
e
solved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keep
i
ng
refs
.
c:
f
i
x
fread erro
r
h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Ke
e
ping
entry: fix
f
ilter l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
t
2
0
0
3: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
diffto
o
l --dir-d
i
f
f
: symlink all file
s
mat
c
hing
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
difftool: avoi
d
doubl
e
sla
s
hes
in sy
m
link targ
e
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool
(
1): fix fo
r
m
a
tting of --symlink
description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
ohn
Keeping
Revert "gra
p
h
.
c: mark pri
v
a
t
e file-scope sym
b
ols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Ke
e
p
ing
Makefile: ma
k
e
m
andi
r
,
htmldir and info
d
ir
a
b
s
o
lute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
e
pi
n
g
rebase -i
:
respect core
.
comm
e
ntchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
combi
n
e-di
f
f
.
c
:
tea
c
h comb
i
ned diffs about line
pr
e
f
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn K
e
epi
n
g
di
f
f
.
c:
use diff_line
_
prefix() wher
e
applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff: add di
f
f
_
line_prefix f
u
nction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff
.
c: make constant strin
g
argumen
t
s
c
onst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: wr
i
te prefix to the c
o
rr
e
c
t
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
ep
i
ng
graph: output padding
for merge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn Keeping
t4038
:
add tests for "diff
--cc
--
r
aw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/ap
p
ly
:
t
i
ghten
(
dis)similarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn
K
eep
i
ng
merget
o
ol--
l
ib: list user c
o
n
f
i
gured tools i
n
'--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
ohn Keeping
R
ename {g
i
t
-
=
> git
}
remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuideli
n
e
s
:
a
dd Python
c
oding
guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
g
it
-
remote-test
p
y: f
i
x path hashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keepi
n
g
merget
o
ol
-
-
lib: don't call "e
x
it
"
in set
u
p
_
tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
g
i
t-diff
t
ool: use git-
m
ergetool--lib f
o
r
"-
-
tool-
h
elp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-mergetool:
d
on't hardcode 'mergetool' in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Ke
e
ping
g
i
t-mergetoo
l
: rem
o
ve redundant ass
i
gnme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keepi
n
g
git-mergetoo
l
: move show_tool_help to me
r
getool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
gi
t
-remo
t
e-
t
e
s
tpy: call p
r
i
nt as a func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remo
t
e-
t
estpy: don'
t
do unbu
f
fered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keepin
g
g
it-
r
emo
t
e-t
e
stpy:
h
a
sh bytes explici
t
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Kee
p
ing
svn-fe: all
o
w
svn
r
d
um
p
_sim
.
py t
o
r
un with
Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
K
e
eping
git_r
e
m
ote_he
l
pers: use 2to
3
if building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git_remote_he
l
p
e
rs: fo
r
ce
r
eb
u
i
l
d if py
t
hon version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-cv
s
i
m
p
ort
.
txt: cvsp
s
-2
i
s deprec
a
t
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Kee
p
ing
git-for-each-ref
.
txt: 'ra
w
'
is a supported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next