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 'rr/diffcore-pickaxe-doc' into maint
2013-07-03
J
o
hn
Kee
p
ing
g
it-config: upda
t
e
doc
f
or --get with multiple v
a
lues
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Keeping
difftool: fix dir-dif
f
w
h
en
f
ile do
e
s
n
ot exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tr
e
e: h
a
ndle direct
o
r
y
/empty conflic
t
c
o
rrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contr
i
b
/subtree:
d
on't delete remot
e
br
a
nches
i
f split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefi
l
e: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
Keeping
merge
-
tre
e
:
f
i
x typo in "both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keepi
n
g
t
r
a
n
sport-helper: add 'signed-tag
s
' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
transport-help
e
r:
pass --sign
e
d
-
t
a
gs=
w
arn-s
t
rip
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
h
n
Keeping
fast
-
export
:
add --signed-ta
g
s=
w
ar
n
-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
t/test-lib
.
s
h: fix TRAS
H
_
D
I
R
E
CT
O
RY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n
Keep
i
ng
m
e
rg
e
-tree: don't
p
rint
ent
r
ies that
m
atch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keepi
n
g
gitremote-hel
p
ers(1): clarify refspec behav
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Keeping
submodule: print graph o
u
tpu
t
ne
x
t to submodul
e
log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keep
i
ng
diff: allow u
n
stuck argume
n
ts wit
h
-
-
diff-a
l
g
o
ri
t
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
it-merge(1): document
diff-algorithm
o
ption to merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n Keeping
b
i
sect: avoid sign
e
d inte
g
e
r overf
l
ow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keepi
n
g
di
f
fc
o
re-break: d
o
n'
t
divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800: run --dir-diff tes
t
s
with and without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Joh
n
Keeping
t7800: fix
t
ests when
difftool uses --no-s
y
mlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800: don't hide grep o
u
tput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
di
f
ftool: don't o
v
erw
r
ite
m
o
dified files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '--symlinks' specif
i
c
test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
Kee
p
i
n
g
m
e
rge-tree: fix
t
y
p
o in me
r
g
e
-
t
ree
.
c::
u
nresolv
e
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix
f
r
ead error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
entry: fi
x
filter looku
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keeping
t2003: modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool -
-
dir-diff: symlink all files matching th
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
difftoo
l
:
avoid double slashes
i
n
s
y
m
link ta
r
gets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
e
p
ing
git-difftoo
l
(1): fix formattin
g
of --symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keep
i
ng
Re
v
ert "graph
.
c
:
mar
k
p
rivate
fi
l
e-scope symbol
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
o
hn K
e
eping
M
a
ke
f
ile
:
make mand
i
r,
htmldir
and inf
o
dir
a
bso
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
re
b
ase -i: respect cor
e
.
c
o
mment
c
ha
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Keep
i
ng
combin
e
-dif
f
.
c
:
te
a
ch combined di
f
fs ab
o
ut line
p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
diff
.
c
: use diff_lin
e
_prefix() whe
r
e applic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add diff
_
lin
e
_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
p
i
ng
diff
.
c: make consta
n
t
s
tr
i
ng arguments c
o
ns
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: write
pre
f
i
x to th
e
correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Jo
h
n K
e
eping
graph: output padding for
m
erge subseq
u
en
t
parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
h
n Kee
p
ing
t4038:
a
dd tests for "diff --cc --
r
aw <tree
s
>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: tight
e
n (dis)similar
i
ty
ind
e
x par
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn
K
eepi
n
g
mergetool--
l
ib: list
u
ser configured tools in '--t
o
o
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
e
name {gi
t
- => git}remote-helpers
.
tx
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
hn Keeping
CodingGuide
l
ines
:
add Python coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-te
s
tpy:
fix path
h
ashing on Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn Kee
p
ing
mergetool
-
-
l
i
b
: don't call "exit" in setup_t
o
ol
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
gi
t
-difft
o
ol: use git-merge
t
o
o
l-
-
lib for
"--to
o
l-he
l
p"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
m
erg
e
to
o
l: do
n
't hardcode 'me
r
getool'
in show_t
o
o
l
_
help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool:
r
emove red
u
ndant assi
g
nment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
eping
git-mergetool: move show_t
o
ol_help to mergetool--
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Ke
e
pi
n
g
g
i
t-remote-te
s
tpy: call prin
t
as a fun
c
t
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-remote
-
testpy: don't do unb
u
ffered
text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-r
e
mote
-
test
p
y: hash bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
svn-fe: allow svnrdump_sim
.
py to run with Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_
h
elpers: u
s
e
2
to3 if
building with Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git_remote_
h
elpers: force rebuild i
f
python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Joh
n
Keeping
g
i
t
-cvsimport
.
txt: cvsps-
2
i
s
dep
r
ecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keep
i
n
g
gi
t
-for-each-ref
.
txt: 'raw' i
s
a supp
o
rted date
f
o
r
mat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keepi
n
g
git_remot
e
_help
e
rs:
f
ix inp
u
t whe
n
runn
i
ng u
n
der Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n Keeping
git_
r
emote_hel
p
e
r
s
: allow building wit
h
Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keep
i
ng
git-
s
vn:
t
ea
c
h
fin
d
-
r
ev to find near
m
atches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-import
(
1): reorg
a
nise
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
Keepin
g
git-fast-
i
mport(
1
): combine documentation of
--
[
no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepin
g
git-shortlog(1):
docu
m
en
t
b
e
ha
v
iou
r
of zero-wid
t
h wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John
K
eepin
g
git-
f
a
s
t-
i
mport(
1
): remove d
u
plicate
'--done'
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
Joh
n
Kee
p
ing
Documentat
i
o
n
: don't link to
e
xam
p
l
e
mai
l
addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
J
o
hn Keepin
g
rebase -i continue: do
n
't skip co
m
mits
that
o
nly change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree