repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
completion: add a note that merge options are shared
2014-05-27
Joh
n
Keeping
comp
l
e
tion: add
a
no
t
e t
h
at
m
erge options a
r
e
s
hare
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-03-11
John
Keeping
built
i
n/mv: fix out of b
o
unds
write
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
J
oh
n
Kee
p
ing
bu
i
l
t
in/mv: don't use memory after free
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: use corre
c
t
type
f
or valu
e
s
in interval table
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John K
e
eping
utf8: fix iconv error detectio
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
notes-utils: handle b
o
olean notes
.
rew
r
itemo
d
e correctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-27
John Keep
i
ng
Make
f
ile: remo
v
e red
u
ndant objec
t
in git-http
{
fetch
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-17
John Keepin
g
p
u
l
l: suppress
error
w
h
e
n
no remoteref is found
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
complet
i
on: h
a
ndle --[no-]f
o
rk-point options
to
git
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
John K
e
e
p
ing
completion
:
complete merge-base options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-09
J
o
hn
Keep
i
ng
rebase: fix fork-point with zero arguments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
re
b
ase: use reflo
g
to find c
o
mmon base with upstr
e
am
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-09
John K
e
eping
pull: us
e
m
e
rge-
b
ase --for
k
-p
o
int w
h
en appropr
i
ate
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
peek-remot
e
: re
m
ov
e
deprec
a
ted
a
l
ias
of ls-re
m
ote
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-found: remove
d
eprec
a
ted comm
a
n
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
tar-
t
ree: remove dep
r
ecat
e
d comma
n
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keepin
g
re
p
o-config
:
remove depr
e
cated alia
s
f
o
r "git config"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-10-03
John Keeping
Documentatio
n
/Makefil
e
: mak
e
Asci
i
Doc
d
blatex
d
ir con
f
igurable
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
-
a
lgorithm
"
option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John K
e
epin
g
rese
t
: handle su
b
module with trailing sl
a
sh
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm:
re-use parse_pathspec's tr
a
iling
-
slash removal
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_rem
o
te_helpers: remove little use
d
Pytho
n
libr
a
r
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
Joh
n
Keepi
n
g
rev-parse(1): lo
g
ically group op
t
ions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John
Keeping
rev
-
parse: remove r
e
s
t
rictions on some opti
o
ns
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: change the descript
i
on to
"int
e
grate" cha
n
g
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn Keep
i
ng
push: a
v
oid s
u
gg
e
sti
n
g "merging" remote changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Ke
e
ping
gi
t
-config(1)
:
clarify pre
c
e
d
ence of mul
t
iple values
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-con
f
i
g
: update doc for --ge
t
with multi
p
le
v
alues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John Ke
e
ping
completion: learn abo
u
t --man-path
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John Ke
e
ping
completion: ha
n
d
le unstuck
f
orm
of ba
s
e gi
t
o
ptions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
fast-i
m
port: allow mo
v
in
g
the ro
o
t tre
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
Jo
h
n Keeping
fast
-
import
:
allo
w
ls or filecopy of the root tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: set vali
d
m
o
d
e on ro
o
t
t
ree in "ls"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John
K
eeping
t93
0
0:
d
o
cument f
a
st
-
import empty path i
s
s
ues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: dro
p
t
he top-le
v
el req
u
iremen
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Keepi
n
g
r
e
v-
p
arse: add -
-
prefix op
t
ion
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
su
b
mod
u
l
e
:
s
h
ow full path in err
o
r mess
a
ge
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
Jo
h
n Ke
e
pi
n
g
t7403: mo
d
ernize style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
t74
0
1: make inde
n
tati
o
n co
n
s
istent
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
eping
m
ergetool--li
b
: refactor {diff,
m
erge}_cmd logic
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
Document
a
tion
/
Makefile: move i
n
fodir to be with
o
ther
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keepin
g
Documentatio
n
/Ma
k
ef
i
le: fix spa
c
es a
r
o
u
n
d assignments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-12
John Kee
p
ing
a
dd--intera
c
tive:
r
espect diff
.
algor
i
thm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-07
Jo
h
n
Keeping
git-gui
:
fix
f
i
l
e
na
m
e handling with non-
e
mp
t
y prefix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-28
John K
e
e
p
ing
fetch: don'
t
try
to update
un
f
e
t
c
hed tr
a
cking refs
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftool: fix
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 Keepin
g
mer
g
e-tree: ha
n
d
l
e
direct
o
r
y/empty c
o
nflict
c
orrectly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t
/
Make
f
ile: don't de
f
ine TEST_RE
S
ULT
S
_DI
R
ECTORY recursively
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
con
t
rib/subtree: don't delete remote branches if
split
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test
o
u
t
put: respect $TES
T
_O
U
TPUT
_
DIRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Ke
e
ping
t/Makefile: rem
o
ve smoke
t
es
t
targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
J
o
h
n Keeping
merge-t
r
ee: fix
typ
o
in "both
chan
g
ed identically"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-27
John K
e
ep
i
n
g
t/Make
f
ile:
f
i
x result handli
n
g w
i
t
h
TEST_OUTPUT_DIRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
transpor
t
-h
e
lper: add 'sign
e
d-tags' c
a
pabili
t
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Kee
p
ing
transp
o
r
t-helper: pas
s
-
-signed-t
a
g
s=war
n
-
s
trip to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Ke
e
p
ing
fast-exp
o
r
t
:
add
--signe
d
-tags
=
warn-strip
mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
t/te
s
t-
l
ib
.
sh: fix TRASH_
D
IRECTORY ha
n
d
ling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
J
ohn
Kee
p
ing
merge
-
tre
e
: don't pri
n
t entri
e
s that mat
c
h "
l
ocal"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Ke
e
p
i
ng
gitremo
t
e
-he
l
p
ers(1)
:
cla
r
ify
r
efspec be
h
avio
u
r
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
subm
o
dule
:
pri
n
t graph output n
e
xt to s
u
bmodul
e
l
og
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
John Keeping
git-
m
er
g
e(1)
:
docum
e
nt
d
iff-algori
t
h
m option to me
r
ge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keep
i
n
g
bise
c
t: av
o
id
sign
e
d
integer overflow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffco
r
e-brea
k
:
don't divi
d
e by ze
r
o
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
780
0
: run --
d
ir-d
i
f
f te
s
t
s
with and
w
it
h
o
u
t symli
n
ks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800: fix t
e
s
t
s when
d
iffto
o
l
us
e
s -
-
no
-
s
y
mli
n
ks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: don't hide grep
out
p
ut
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool
:
don't
o
verwri
t
e
m
o
dified files
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n
Keeping
t
7800: move
'
--symlinks'
s
pecific test to the end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tree: fi
x
ty
p
o in merge-tree
.
c::u
n
r
e
solved
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n Keeping
r
efs
.
c: fix fread erro
r
handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
entry: fix filter lookup
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
K
e
eping
t2
0
03: modernize style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
di
f
ftool --d
i
r
-
diff: symlink all fi
l
es matching
t
he
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
difftool: avoid
d
ouble slashes in symlink targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
git-difftool(1): f
i
x f
o
rmatting of --s
y
mlink description
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
J
o
hn
K
eepin
g
R
e
vert "graph
.
c: mark private file-scope sy
m
bols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makef
i
le: make mandir, htmldir and
infodir absolute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Ke
e
ping
rebase -i:
re
s
pec
t
c
ore
.
comme
n
tchar
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Ke
e
ping
combin
e
-diff
.
c
: teach c
o
m
bin
e
d diffs ab
o
u
t
line pr
e
fix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
dif
f
.
c: use
d
iff_line_prefix(
)
w
h
e
re appli
c
able
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn
Keeping
diff:
add
diff_
l
ine
_
pre
f
ix
function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn
K
eepi
n
g
diff
.
c: mak
e
constant
stri
n
g
a
rguments const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keep
i
ng
d
iff: wr
i
te pre
f
ix to the cor
r
e
c
t fi
l
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
epi
n
g
g
r
aph: ou
t
pu
t
padding for
m
erge s
u
bs
e
quent parent
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John Kee
p
ing
t4038: add tests for "di
f
f --cc --ra
w
<trees
>
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply:
t
ighte
n
(dis)similari
t
y in
d
ex parsing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
ng
mergetool--lib: l
i
s
t
u
s
er
c
onfigured tool
s
in '--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
John Ke
e
p
ing
Ren
a
me {git- => git}r
e
mo
t
e-
h
e
l
per
s
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
C
o
d
i
ngG
u
i
d
elines: add Py
t
hon coding g
u
idelines
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Keeping
g
it-remote-testpy: f
i
x path hashing
o
n Python
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mer
g
e
t
ool--lib: don't c
a
ll "exit"
i
n s
e
tup_t
o
ol
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-difftool:
use git-
m
er
g
etool-
-
l
i
b f
o
r
"--t
o
ol
-
help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-mergetool: don
'
t hardcode
'
mergetool
'
in
s
h
o
w_tool
_
help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git
-
mergetoo
l
: remove redundant assignment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keepi
n
g
git
-
mergetool: move show_tool_help to m
e
rget
o
ol-
-
li
b
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
eping
g
it-
r
emote-testpy: call pri
n
t
a
s a
f
un
c
t
i
on
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
r
e
mote-testpy:
d
on't do
u
nbuf
f
e
r
ed text I/O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
g
it-remote-te
s
t
p
y: ha
s
h
b
ytes expl
i
citly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
next