repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'va/fix-git-p4-tests'
2015-03-31
John Keeping
s
t
ream
i
ng
.
c
: fi
x
a
memlea
k
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John
K
eeping
co
m
pletion: complete `git push --forc
e
-with-lea
s
e=`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
J
ohn Keepin
g
completion: ad
d
some missing option
s
to `git push
`
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-22
John
Keeping
com
p
l
eti
o
n: complete
"unstuck" `git push --recurse
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-16
John K
e
e
p
in
g
rebase: omit patch-identical commits with --f
o
rk-p
o
i
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-07-15
John Keepi
n
g
rebase--am: use --cherry
-
p
ick instead
o
f --ignore-if
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John
K
eeping
c
o
mpletion: add mi
s
s
i
ng options for git-merge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-05-27
John Keepin
g
c
o
m
pl
e
tion:
a
dd
a
n
o
te that
merge opti
o
ns are shared
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-03-11
John Keepi
n
g
b
u
il
t
i
n
/mv:
f
i
x out of bounds
write
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
ing
b
uiltin/mv: don't use memory after
fr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: use
c
orrect type for v
a
lues in interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Keeping
u
t
f8: f
i
x i
c
onv err
o
r
d
etecti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
K
e
eping
notes-utils: handle boolean
n
otes
.
rewrite
m
ode
co
r
r
e
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John K
e
eping
Makefile: rem
o
ve redundant object in
g
i
t-ht
t
p{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keeping
pull
:
suppres
s
er
r
or when
no remo
t
eref is
f
o
und
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completion: h
a
n
dle --[no-]fork-point opti
o
ns
to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
comple
t
ion: complete merge-base op
t
io
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
Joh
n
Keeping
rebase: fix fork-point with zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
r
e
base: use reflog to find c
o
mmon
b
ase with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keeping
pu
l
l
:
use merge-base --fork-point when ap
p
ropriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn Ke
e
ping
pee
k
-remot
e
: remove depre
c
a
t
e
d alias of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepin
g
l
o
st-fou
n
d
: remo
v
e dep
r
ecated comm
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keep
i
ng
tar-tree: remov
e
deprecated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Kee
p
ing
repo-config: re
m
ove d
e
precated alias
f
or "git
c
onfig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
Jo
h
n Ke
e
pin
g
D
ocu
m
entation
/
Makefile:
make
AsciiDoc db
l
atex
d
i
r
c
onfigu
r
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keep
i
ng
m
erge-recursi
v
e: fi
x
p
a
rsing
o
f "diff-
a
l
g
orithm" option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John
K
eeping
reset: h
a
n
d
le
s
ubmodule w
i
th trai
l
ing sl
a
sh
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Joh
n
Keeping
rm:
r
e-us
e
parse_
p
aths
p
ec's
t
r
a
ilin
g
-slash re
m
oval
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
J
o
hn
K
eep
i
ng
g
it_remote_helpers: remo
v
e little used Python libr
a
ry
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keepi
n
g
rev-parse(1): log
i
cally group
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keep
i
ng
r
ev-parse: remove
restrictions o
n
some op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John K
e
e
ping
pull:
chang
e
t
he description to "integrate" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avo
i
d suggesting "m
e
rging" re
m
ote
c
hange
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Jo
h
n
Keepi
n
g
g
i
t-
c
onfig(1): clarify
pr
e
cedence of multiple
v
alues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John
K
eeping
git-c
o
n
f
ig: u
p
date d
o
c for --get with mul
t
iple
v
al
u
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
comp
l
et
i
on
:
lea
r
n about --man-
p
ath
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Keepi
n
g
c
om
p
letion:
handle unstuck form o
f
bas
e
git optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-i
m
p
o
r
t: allow moving the roo
t
tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast
-
imp
o
rt: allow ls
o
r filec
o
py of the ro
o
t
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
fast
-
import:
set va
l
id mode on ro
o
t tree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eepin
g
t930
0
: document fast-import empty path
issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
subm
o
d
ule: drop th
e
top-le
v
el requirem
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
ping
rev-parse:
a
d
d --pr
e
fi
x
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
s
ubmodule: show full path i
n
er
r
or
m
e
ssage
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t74
0
3: a
d
d
mis
s
ing
&& chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t74
0
3:
moder
n
ize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
Keeping
t7401:
m
ake indentation c
o
nsistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mergetool
-
-lib: refactor {di
f
f,me
r
ge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Ke
e
pi
n
g
Documentation/Ma
k
efile: move
infodir to be with othe
r
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
Do
c
umentation/Makefile:
f
i
x space
s
around assign
m
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
n
Keeping
add-
-
interactive: respect di
f
f
.
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Joh
n
Kee
p
ing
git-gui: fix fi
l
e name handling with
n
o
n
-empty
p
ref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: don't try t
o
update unfetched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keepin
g
difftool: fix
dir-diff when
f
ile does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: handle di
r
ectory
/
empty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keepi
n
g
t/
M
akefile:
d
on't
d
e
fine TEST_
R
ESULTS_DIRECTORY recursi
v
ely
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
ohn
Keepi
n
g
contr
i
b
/
su
b
tree: don't
d
e
lete remote bran
c
h
es if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output: respect $
T
ES
T
_OUTPUT_DIRECTOR
Y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Ke
e
ping
t
/M
a
kefile: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Kee
p
ing
merge-tree: fi
x
t
ypo in "both
c
h
anged identicall
y
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John K
e
eping
t
/Makefi
l
e: f
i
x
result handling with TEST_O
U
TP
U
T_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
r
anspor
t
-he
l
per: a
d
d 'sign
e
d-tags
'
capabil
i
ty
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
transport
-
helper: pass
--signed-ta
g
s=wa
r
n-str
i
p
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
fast-export:
a
dd
--sig
n
ed-tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
t
/
test-lib
.
sh:
fix
T
R
ASH_DIRE
C
TORY
h
andlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eeping
merge-t
r
ee: don't p
r
int en
t
ries t
h
at
match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keep
i
ng
gitremote-helpers(1): c
l
arif
y
refspec behaviou
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keepin
g
submo
d
ul
e
: print gra
p
h output next to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keeping
diff:
a
llow unstuck ar
g
umen
t
s
w
ith --d
i
ff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Ke
e
ping
git-merge(
1
): document diff-al
g
orithm opt
i
on to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Kee
p
in
g
bisect: avoid signed integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Ke
e
ping
d
i
ff
c
o
r
e
-
br
e
ak: don't d
i
vide
by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
oh
n
Keep
i
ng
t7800: run --dir
-
diff test
s
w
i
th
and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
K
eeping
t7800: fix tests when diffto
o
l
uses
-
-no
-
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
ee
p
ing
t780
0
:
don'
t
hide g
r
ep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
difftool: do
n
't ov
e
r
w
rite modifie
d
fi
l
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t7
8
00: move '--symlinks' specific test t
o
the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn Keeping
merge
-
t
r
e
e: fix
t
ypo in m
e
rge-tre
e
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fread
e
rro
r
han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix
f
i
l
ter loo
k
up
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
epin
g
t20
0
3: modernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
difftool --dir-dif
f
: symlink all fi
l
es
matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
i
ff
t
ool:
avo
i
d double sla
s
h
e
s
in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-d
i
f
ftool
(
1): fix
f
or
m
at
t
ing
o
f
--symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Ke
e
p
ing
Revert "grap
h
.
c:
m
ark
p
rivate file
-
scope sy
m
bols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John K
e
e
ping
Makefile: make mandir, htmldir
a
n
d
infodir absolu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eepi
n
g
r
e
base -i: res
p
ect core
.
com
m
ent
c
har
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
c
o
mbine-di
f
f
.
c: teach combined diffs about l
i
ne
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keep
i
ng
d
i
ff
.
c
: u
s
e diff_line_prefix() where
a
ppl
i
cable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
dif
f
: add diff_line_p
r
e
f
ix
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
e
p
i
n
g
diff
.
c: ma
k
e constant
st
r
ing argum
e
nts const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Kee
p
ing
diff: writ
e
pre
f
ix to the
c
orrect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn K
e
eping
graph
:
output padding f
o
r merge subsequent p
a
rents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John K
e
e
ping
t4038: add
t
e
sts for
"
d
i
ff --cc
-
-raw <tre
e
s>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
h
n
Keeping
builtin/a
p
ply:
t
i
g
hten (dis)simil
a
rity index
p
arsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
merget
o
ol--
l
i
b
: list user configured to
o
ls in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
K
ee
p
ing
Ren
a
m
e
{git
-
=> git}remote-h
e
lpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
CodingGuidelines: add
P
ython
coding guid
e
lines
commit
|
commitdiff
|
tree
2013-01-28
J
oh
n
K
eeping
git-remote-t
e
stpy: fix p
a
th
h
a
shing
o
n Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn
Keeping
mergetool-
-
lib: don't call "exi
t
" in s
e
t
up_
t
o
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next