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 Kee
p
ing
bui
l
t
i
n
/mv
:
fix out of
bounds
w
rite
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
builtin/mv: don'
t
u
se
m
e
m
ory aft
e
r free
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John Keep
i
ng
utf8: use correct typ
e
for values in interval table
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
John
K
eeping
utf8: fix iconv error d
e
tection
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-02-18
J
o
hn Keeping
notes-utils: handl
e
boolean
n
otes
.
rewrite
m
ode
c
o
r
r
ect
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-27
J
o
hn
K
eeping
Makefile: remo
v
e redundant object
in
git-http{f
e
tch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Keeping
p
u
ll: suppress error whe
n
no remoteref is found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
Jo
h
n Keeping
com
p
letion:
h
andle
-
-
[
no-]fork-point options t
o
git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John K
e
e
ping
completion
:
compl
e
te merge-base
option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebase: fix fork
-
point with zero
a
rguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Keeping
r
ebase: use re
f
log
to find common
b
as
e
with upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Keepi
n
g
p
u
ll: use merge-base --fork-point whe
n
a
p
propriate
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keepi
n
g
peek-rem
o
te: r
e
move deprecat
e
d alias of l
s
-
remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Ke
e
ping
lost-fou
n
d: re
m
ove deprec
a
ted command
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
ohn Keepi
n
g
ta
r
-
t
ree:
r
emove deprec
a
ted comm
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
r
e
po-confi
g
:
r
e
mov
e
deprecated alias for "git config"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
Keeping
Do
c
umentation/Makefile:
ma
k
e Ascii
D
oc dblatex d
i
r
configura
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merg
e
-recurs
i
ve: fix parsi
n
g of
"
diff-al
g
orithm"
o
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keep
i
ng
reset: handle submodule with
t
railing sl
a
sh
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
J
o
hn
K
eeping
rm: re-use
pa
r
s
e
_
p
athspec's trai
l
in
g
-
slash removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Keeping
git_remote_helpers: re
m
ove little used Pyt
h
on li
b
rary
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John
Keeping
re
v
-pa
r
se(1): logically gr
o
up op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse: remove
r
es
t
rictions on
s
ome options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
J
o
hn K
e
eping
pull: change th
e
descr
i
ption
t
o
"integr
a
te" changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Ke
e
ping
push: av
o
id suggesting "mergi
n
g" remote
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
git-config(1): clarify precedence of multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John K
e
eping
git-c
o
nfig: u
p
date doc for --get
w
ith multiple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
ohn K
e
eping
completion:
l
e
a
rn about -
-
man-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Ke
e
ping
completion: handle
u
ns
t
uck form of base g
i
t o
p
tions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keepin
g
fas
t
-impo
r
t: al
l
ow moving t
h
e r
o
ot tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import:
a
llow ls or
f
ileco
p
y of the root tree
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
f
a
s
t-import: set valid mode on root tree in "
l
s"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n
K
eeping
t9300: document fa
s
t
-im
p
ort
e
mpt
y
p
ath issu
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: drop the top-level requirement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
re
v
-parse: add --pref
i
x op
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keeping
sub
m
o
dule: show fu
l
l path in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t
74
0
3: add missing && ch
a
inin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Ke
e
p
i
ng
t7403: moder
n
ize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keep
i
ng
t7401: make
indenta
t
ion cons
i
stent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
me
r
ge
t
ool--lib: refactor
{diff,merge}_cmd logic
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keepi
n
g
Documentation/M
a
kefile: move infodir to b
e
wit
h
other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
Kee
p
ing
Docum
e
ntation/Makefile: fix sp
a
ces ar
o
und
a
ssignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
n Keeping
a
dd--intera
c
tive: r
e
spect diff
.
a
l
gorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
J
ohn Keeping
git-gu
i
: f
i
x file name handling with n
o
n
-
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 unfetc
h
ed trac
k
i
n
g refs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John
Keeping
difftool
:
fix dir-diff when file d
o
es not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keepin
g
m
erge-tree: han
d
le di
r
ectory/emp
t
y con
f
lict
c
orrect
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Mak
e
fi
l
e: don't define TE
S
T_RESUL
T
S
_DIRECTORY
recursively
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keep
i
ng
co
n
t
rib/
s
ubtree: don't
delete remote branches if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keep
i
ng
test output: respect
$
TEST_OUTPUT_D
I
RECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Kee
p
ing
t/Makefile: r
e
m
ove smok
e
test targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tr
e
e: fix
t
ypo
i
n "both chang
e
d identica
l
ly"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Kee
p
ing
t/Makefile: fix result
h
an
d
ling
wit
h
TEST
_
O
UTPU
T
_DIRECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
pin
g
transpor
t
-hel
p
er: add 'signed-tag
s
'
c
apabil
i
ty
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
transport-helper: pass --sign
e
d
-tags=warn-st
r
ip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
fast
-
export: add --sign
e
d-tags
=
warn-
s
trip
mo
d
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
t
/test-l
i
b
.
sh: fix TR
A
SH_D
I
R
E
CT
O
RY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
J
ohn
Keeping
m
erge-tree
:
don't print ent
r
ies
t
h
at match
"
loca
l
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Jo
h
n Kee
p
i
ng
gitr
e
mote-helpers
(
1):
c
larify re
f
spec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
sub
m
odule: pri
n
t graph o
u
t
put ne
x
t to s
u
b
module log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keepi
n
g
diff: allow u
n
stu
c
k arguments with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
git-merge
(
1): doc
u
me
n
t diff-algorithm option to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
e
epin
g
bisec
t
:
avoid signed
i
n
teger
overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
ohn
Keeping
d
iffcore-bre
a
k:
d
o
n
't d
i
v
id
e
by z
e
ro
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eep
i
ng
t78
0
0: run
--di
r
-diff tests
w
ith a
n
d
w
it
h
ou
t
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7
800: fix tests when difftool use
s
--n
o
-
s
ym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n
K
eeping
t7800: don't hide gr
e
p o
u
tput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
di
f
ft
o
ol: d
o
n't
o
verwrite modifie
d
f
iles
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800
:
move '--symlink
s
' specific
test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Jo
h
n Keeping
m
erge-tree: fix typo in merge-
t
ree
.
c
:
:unresol
v
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n K
e
eping
refs
.
c: fix f
r
ead
e
r
ror handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
ent
r
y
: fix filter loo
k
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
t2003: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
e
p
ing
d
i
f
ftool --di
r
-diff: symlink all files
m
atch
i
ng th
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: avoid
doub
l
e slashes in s
y
m
l
ink
t
arg
e
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
git-difftoo
l
(1): fix formatting of
-
-symlink descript
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "
g
rap
h
.
c: m
a
rk private file-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Kee
p
i
ng
Makefi
l
e: make mandi
r
, htm
l
d
ir and
i
nfo
d
ir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: respect core
.
c
o
mment
c
har
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combin
e
-
d
i
ff
.
c
:
teach combined diffs about lin
e
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keepi
n
g
diff
.
c
:
us
e
d
iff_line_pre
f
ix(
)
w
here applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
diff: add diff_li
n
e_pref
i
x function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff
.
c: make co
n
s
t
ant strin
g
ar
g
uments
c
onst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff: write
p
refix
to
t
h
e corre
c
t file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
eping
g
r
a
p
h: output padding
for m
e
rge subsequent pa
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
Jo
h
n Keeping
t4038: add tes
t
s for "diff --c
c
-
-
raw
<
tr
e
es>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: ti
g
hten (dis)
s
imil
a
rity index par
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Ke
e
p
i
ng
mer
g
etoo
l
--
l
i
b: list
use
r
co
n
figured
t
ools in '--to
o
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
ohn Kee
p
ing
R
e
name
{
git- =>
git}re
m
ote-hel
p
ers
.
tx
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
K
e
eping
C
o
dingGuideline
s
: add
P
ython coding gu
i
delines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-testpy: fix
p
at
h
hashi
n
g on Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
m
erg
e
tool--l
i
b: don't
c
all "exit" in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-difftool: use git-mergetool--lib
f
or "--tool-help
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mergetool: don
'
t hardcode 'merge
t
oo
l
'
in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
getool: remove redundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keepi
n
g
git-me
r
getool: m
o
ve show_tool_help
to merge
t
ool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-re
m
ote-testpy: call p
r
int as a fu
n
ction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
ping
git-remote-testpy: don't d
o
u
n
buffered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
e
ping
gi
t
-remote-testpy: hash
byte
s
ex
p
licitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eepi
n
g
svn-fe: allow svnrdu
m
p_sim
.
py to run wit
h
Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next