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
Merge branch 'js/userdiff-cc'
2014-03-11
John
K
ee
p
ing
b
u
i
l
tin/mv: fi
x
out of bounds
w
rite
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Kee
p
ing
buil
t
in/mv: d
o
n
't
use m
e
mory after
free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: us
e
c
o
rrect
t
ype for
values i
n
interval
t
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
Jo
h
n
K
eepin
g
ut
f
8: fix iconv
error det
e
ct
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
n
otes-utils: handle boolean notes
.
rewritemode correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
John
Kee
p
in
g
Makefile: remove redundant o
b
ject in g
i
t
-http{
f
etch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
J
ohn Keeping
p
u
l
l
: suppress error whe
n
no remoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John Keeping
completion:
handle --[n
o
-]fo
r
k
-
poin
t
options to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
Keeping
completion: c
o
mp
l
ete merge-base option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
Jo
h
n K
e
eping
rebase: fix
f
ork
-
point wi
t
h ze
r
o
arg
u
me
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
Joh
n
Keep
i
ng
rebase: use refl
o
g
to
f
i
nd
common
b
a
s
e
with
u
pstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
J
ohn
Keepi
n
g
pu
l
l: use me
r
ge-b
a
se
--fork-point
w
hen appropria
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn
K
eepin
g
peek-
r
emote:
remove deprecated ali
a
s of ls-re
m
ote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keeping
l
o
s
t
-found:
remove de
p
recated command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
K
eep
i
ng
tar-t
r
e
e: re
m
ov
e
deprecat
e
d
command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n Keeping
re
p
o-
c
onfig: re
m
o
ve deprecated alia
s
f
o
r
"
git
c
onfig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
Ke
e
ping
Documenta
t
ion/Ma
k
efile:
m
ake
A
s
c
iiDoc dblatex dir confi
g
urable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
J
ohn
K
e
eping
merge
-
r
e
cur
s
i
ve: f
i
x
p
arsing of "diff-
a
lgorithm
"
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
res
e
t: handle submodule
with trailing
s
lash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n Ke
e
ping
rm: re-use
p
arse_pathspec's trailing-
s
lash rem
o
val
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Kee
p
i
n
g
git_remote_helpers: remove little used Python
library
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
K
eeping
rev-parse(1): logically
g
roup opt
i
o
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
Keeping
rev-parse: remove restricti
o
ns on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
ohn Keeping
pull:
c
hange the
descriptio
n
to "integrate"
c
hanges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
Keeping
push: avoid
s
uggesting
"merging" remote chang
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John
K
eep
i
ng
git
-
config(1): c
l
a
r
i
f
y precedence
o
f
m
u
ltipl
e
val
u
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keeping
git-co
n
fig: u
p
dat
e
doc for
--get wi
t
h multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keep
i
ng
comp
l
etion:
l
ea
r
n about --man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keepi
n
g
comple
t
ion: handle
u
n
s
tuc
k
f
o
rm of base git options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keep
i
n
g
f
a
st-im
p
o
rt: allow moving the root
tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
K
e
eping
fast
-
import: allow l
s
or file
c
o
p
y of
the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Kee
p
ing
fast-import
:
set valid m
o
de o
n
root
t
ree in "ls"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t930
0
: docum
e
nt fast-imp
o
rt empt
y
pa
t
h
issues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Joh
n
Kee
p
ing
submodule: drop the top
-
level requireme
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
rev-p
a
r
se:
a
dd --prefix option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
submodule: show ful
l
pa
t
h
in error mess
a
ge
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
ohn Ke
e
ping
t7403: add mis
s
ing &
&
cha
i
n
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t740
3
: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7401: m
a
ke in
d
entatio
n
consiste
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
mergetool--l
i
b: refactor {diff,
m
erge}_cmd
l
ogic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
epi
n
g
D
o
c
umenta
t
ion/Ma
k
efile: move in
f
odir t
o
be
w
i
th other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Document
a
ti
o
n/Makefile: fi
x
spaces ar
o
und ass
i
gnments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Joh
n
Keeping
add--
i
nteracti
v
e: res
p
ect diff
.
algo
r
ith
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
John
K
e
eping
g
i
t-g
u
i: fix
file name handling wit
h
non-empty
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
John Keeping
fetch: don't
try to update unf
e
tched tracking refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
Jo
h
n Keeping
difftoo
l
: fix dir-diff wh
e
n
file d
o
e
s not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n K
e
eping
merge-tr
e
e: han
d
le
d
irectory/empty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Kee
p
ing
t/Makefi
l
e: don
'
t define TEST_
R
ESULTS_DIRECTORY recu
r
siv
e
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
c
o
ntrib/subtre
e
:
don't d
e
lete remote branches if
sp
l
it
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output: respect $T
E
S
T
_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keeping
t/Makefile: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Kee
p
ing
m
erge-
t
r
e
e: fix typo in "bot
h
cha
n
ged
ide
n
tically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keepi
n
g
t
/
Makefile
:
fix result
h
and
l
ing with TEST_OUTPUT_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
e
e
ping
transport-helper:
a
dd
'
s
ign
e
d-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
t
r
ansport-helper: pa
s
s --sign
e
d
-
tags=w
a
rn-strip t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-
e
xport
:
add --sign
e
d-tags
=
warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn
K
e
eping
t
/
test-
l
ib
.
sh: fix TRASH_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
ohn Keeping
me
r
ge
-
t
r
e
e: don't print
e
ntries that
m
atch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
hn
K
eeping
gitremo
t
e
-he
l
pers(1): clarify refspec b
e
haviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
submodule:
p
rint graph output next
t
o
s
u
bm
o
dule lo
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff: al
l
ow unstuck
a
r
gume
n
ts with --diff
-
algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-me
r
ge(1): document d
i
ff
-
a
lg
o
ri
t
hm o
p
tion
t
o
m
erge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n K
e
eping
bis
e
ct
:
avoid s
i
gn
e
d integer overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
diffcore-break: don't divide
by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t7800: run
--di
r
-diff tes
t
s with
and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: fix tests
w
hen difftool
u
ses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t
78
0
0: don't hid
e
grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
difftool:
don't over
w
rite modified
f
iles
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t7800: move '-
-
symlink
s
'
s
pecific tes
t
to
t
h
e
end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tree
:
f
i
x typo in merge-t
r
ee
.
c::un
r
esol
v
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n Keeping
refs
.
c: fix
fread error han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Ke
e
ping
e
ntry: fix filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
t2
0
03: mo
d
ernize styl
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool --
d
ir-d
i
ff
:
symlink all
f
i
l
e
s
mat
c
hing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keepi
n
g
difftool:
avoid doub
l
e
s
lashes in symlink
t
arge
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
git-
d
ifftool
(
1): f
i
x forma
t
tin
g
of --sy
m
link descriptio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert
"
graph
.
c: mark private file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John
K
eeping
Makefil
e
: make mandir, ht
m
ldir
a
nd in
f
odir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase
-i: respect core
.
co
m
mentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
co
m
bi
n
e
-
d
i
ff
.
c: tea
c
h
com
b
i
ned di
f
fs about line pref
i
x
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
iff
.
c
:
use diff_
l
ine_prefix() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
diff: add diff_line_pre
f
ix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff
.
c: make consta
n
t string arguments cons
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn K
e
ep
i
ng
diff:
write prefix to the correct
f
ile
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn Keeping
graph: output padding for merge subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Ke
e
ping
t4038: add t
e
sts
f
or
"
diff --
c
c --ra
w
<trees
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
b
u
iltin/app
l
y: tighten (
d
is)si
m
ilarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Ke
e
pin
g
mergetool--l
i
b: list user
c
o
n
figu
r
ed tools
in '--too
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git-
=
> git}remote-he
l
pers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn
Ke
e
pi
n
g
CodingG
u
ide
l
ines: add Python
cod
i
ng
g
uidel
i
ne
s
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn K
e
eping
git-remote-t
e
stp
y
:
fix path hashing on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keepin
g
mergetool--lib: do
n
't call "exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
g
i
t-difft
o
ol:
use git-mergetoo
l
--lib fo
r
"
--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn
K
e
e
ping
git-merge
t
o
ol: don
'
t hardcode 'mergetool' in sho
w
_to
o
l_he
l
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
K
eep
i
ng
git-mergetool: remove redundan
t
assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-me
r
getool: move s
h
ow_tool
_
he
l
p
to
m
e
r
g
e
tool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-remote-testpy: call print as a fu
n
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
gi
t
-
r
e
mote-te
s
tpy:
d
on't
do unbuffered tex
t
I/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-tes
t
p
y: hash
b
y
t
es ex
p
l
i
citly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
svn-fe: al
l
ow
s
vnr
d
um
p
_sim
.
p
y
to run wit
h
P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next