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
pull: change the description to "integrate" changes
2013-07-08
John Keep
i
ng
pull:
change the descripti
o
n to "integrat
e
" changes
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keeping
push: avo
i
d s
u
ggestin
g
"merging" remote c
h
anges
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
diffto
o
l
:
fix dir
-
diff when f
i
l
e
does not exist in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
Joh
n
Keeping
merge-t
r
ee: h
a
ndle direct
o
ry/empty confl
i
ct correctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keepi
n
g
t
/Makefile: re
m
o
ve smo
k
e te
s
t tar
g
e
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
merge-tr
e
e
: fi
x
typo in "both changed identically"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keepin
g
transport-help
e
r: add
'signed-t
a
gs' ca
p
ability
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
trans
p
ort-helpe
r
:
p
ass
--sign
e
d-tags=warn-st
r
i
p to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast
-
export:
a
dd
--s
i
gned-ta
g
s=warn-strip m
o
d
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test-lib
.
sh: fix TR
A
SH_D
I
RECTORY
h
andl
i
ng
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n Keeping
merge-
t
ree
:
don
'
t
print entries
t
hat
m
a
tch "local"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitrem
o
te-helpers(1
)
: clar
i
fy refsp
e
c b
e
h
aviour
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
sub
m
odule: print
g
raph output next to su
b
mod
u
le log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
dif
f
: allow unstuck arg
u
ments wit
h
--diff-algor
i
thm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keepi
n
g
git-merge(1
)
:
do
c
umen
t
diff-algorithm option to
merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Kee
p
ing
bisect: av
o
id signed integer ove
r
flow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Ke
e
pi
n
g
diffcore-b
r
eak: don't divide by zero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t780
0
:
run --dir-diff t
e
sts with and w
i
t
hout
s
y
m
links
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
f
ix te
s
ts when
d
ifftool uses
-
-no-symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00
:
do
n
'
t hide grep
output
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
difftool:
d
on't
ov
e
rwrite
m
odified f
i
les
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
n
g
t7800:
move '--symlinks' specific t
e
st
t
o the e
n
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
J
o
h
n Keeping
m
erge-
t
ree: fi
x
typo i
n
merge-tree
.
c:
:
unresolve
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
John
Keepi
n
g
refs
.
c: fix fre
a
d error hand
l
ing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix filter looku
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keep
i
n
g
t2
0
03: modern
i
ze style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
dif
f
t
o
ol --di
r
-diff: symlink al
l
f
i
les matching the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool:
avo
i
d double slashes in symlink tar
g
ets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn
K
eeping
g
i
t-difft
o
ol(1)
:
fi
x
formatting of --symlink des
c
ription
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
John Kee
p
i
ng
Revert
"graph
.
c: mark private file
-
sco
p
e sy
m
bols a
s
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
John Keep
i
ng
M
akefile
:
make
mandir, htmldir and i
n
fo
d
ir absolute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
i
n
g
rebase -i:
r
e
s
p
ect core
.
commentcha
r
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
eping
comb
i
ne-diff
.
c: te
a
ch combined
d
iffs about line pr
e
fi
x
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
diff
.
c: use diff_lin
e
_
p
r
efix() w
h
ere appli
c
a
bl
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
d
iff: add d
i
ff_line_prefix function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c
: make co
n
stant string argume
n
t
s
const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: w
r
ite pref
i
x to t
h
e cor
r
e
c
t
file
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John Keep
i
n
g
grap
h
:
output paddi
n
g for merge
subse
q
uent pa
r
ents
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add tests for "diff --cc --r
a
w <trees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Ke
e
ping
builtin/apply
:
tighten
(
dis)sim
i
la
r
i
ty i
n
dex parsi
n
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
merget
o
ol--li
b
: list user configu
r
ed
t
ools in '--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
Jo
h
n
Keep
i
ng
R
e
name
{
git- =>
g
it}remote
-
h
e
lpe
r
s
.
tx
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John
Keepin
g
Codi
n
gGuidelines: add Python coding g
u
i
d
e
l
ines
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
git-remote-testpy:
fix path hashing on Python
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
m
ergetool--lib:
don't call "exit
"
in s
e
tup_
t
ool
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-difftool:
u
se git-merg
e
tool--li
b
for "
-
-tool-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-mergetoo
l
: don't
h
ardcode 'mergetool' in show_tool_hel
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
m
erget
o
ol: rem
o
v
e redun
d
ant
assignm
e
nt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-merg
e
tool: move show_tool
_
help to
mergetool--l
i
b
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
p
i
n
g
git-r
e
mote-t
e
stpy: call prin
t
as
a f
u
nction
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
r
e
mote-testpy: don't do unbuff
e
red te
x
t
I
/O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-t
e
s
tpy: hash
by
t
e
s explic
i
tly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
svn-fe: allo
w
svnrdump_sim
.
py to run
wit
h
Pyth
o
n 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn K
e
eping
git_remot
e
_helper
s
: u
s
e 2to3 if
b
u
i
lding wi
t
h Pyt
h
o
n
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git_remo
t
e_he
l
pers:
f
orce rebuild
if python version
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
Jo
h
n Keeping
git-cvsimport
.
txt
:
cvsps
-
2 is
d
eprecated
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
Joh
n
Keeping
git
-
for-each-r
e
f
.
txt: 'raw
'
is a supported d
a
te fo
r
m
a
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Ke
e
ping
g
it_remote_helper
s
:
fix
input when runn
i
ng under
Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote_helpers: allow building
w
i
t
h Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-17
Joh
n
Keepin
g
git-svn: teach fin
d
-r
e
v t
o
find near match
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keepi
n
g
g
it-fa
s
t
-
i
mport(1)
:
reor
g
ani
s
e
option
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keepin
g
git
-
fast-import(1): combine do
c
umenta
t
ion of --[no
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-shortlog(1):
do
c
u
m
ent b
e
haviour
of zero-widt
h
wrap
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fas
t
-import(1): remove duplicate '--don
e
' option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-12-17
John Keep
i
ng
Do
c
ume
n
tation: don't l
i
nk
to example mail addresses
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-04-09
John
K
eeping
re
b
a
se -i co
n
tinue: don't s
k
i
p
c
omm
i
t
s
t
h
at only change
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree