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 'nd/tag-doc'
2014-01-27
John Keep
i
ng
Makef
i
l
e
: remove redundant
object in git-
h
ttp{fetch
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-17
John Kee
p
ing
pull: suppre
s
s
e
r
r
or when no remoteref is
found
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
J
o
hn Keeping
completi
o
n: han
d
le --[no-
]
fork-p
o
int op
t
ions to git
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-13
John
Keeping
completi
o
n: comp
l
ete mer
g
e-base option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2014-01-09
John K
e
eping
rebase: fix fork-point wi
t
h zero arguments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-10
John Ke
e
p
ing
rebase: use reflog to find common bas
e
wit
h
upstream
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-12-09
John Kee
p
ing
p
u
ll: use merge-base --fork-poi
n
t
w
h
en
a
pp
r
op
r
iat
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John
K
eeping
peek-remote:
remove depreca
t
e
d
alias
of ls-remote
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
lost-found: remov
e
d
epr
e
cat
e
d
c
omm
a
nd
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
J
o
h
n Keeping
t
a
r-t
r
ee: remove de
p
r
ecate
d
c
omma
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-11-12
Joh
n
Keep
i
ng
repo-c
o
nfig: remove depre
c
a
ted alias for "g
i
t
c
onfig"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-10-03
John
Keep
i
ng
Do
c
u
m
entation/Ma
k
efile: make AsciiDoc d
b
latex dir
configurable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-26
John Keeping
merge-recursive: fix
par
s
ing
o
f
"
d
i
ff-algorit
h
m" opt
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keepin
g
reset: handle
s
u
b
mo
d
ule wit
h
trailing slash
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re
-
use
p
arse_pat
h
spec's trai
l
ing-sl
a
sh removal
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-09-09
John Ke
e
pi
n
g
gi
t
_remot
e
_
helpers
:
rem
o
ve littl
e
us
e
d Python lib
r
a
ry
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keeping
rev-parse(1)
:
logically group options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-22
John Keepin
g
re
v
-parse: remove restriction
s
on some options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-08
John Keeping
pull: change the desc
r
iption to "integrate" ch
a
nges
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn Keeping
push: avoid suggesting "merg
i
ng" remote
changes
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-07
Joh
n
K
e
epi
n
g
git-
c
onfig(1)
:
clarify precedence o
f
multi
p
le values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-07-03
John Keepi
n
g
git-config
:
up
d
ate doc for --g
e
t with
m
ul
t
iple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
J
o
hn Keepin
g
c
o
mp
l
etion: learn a
b
out --ma
n
-path
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-30
John Keeping
completion
:
handle uns
t
uck form of bas
e
g
it
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
ohn
Ke
e
pi
n
g
f
a
s
t-impor
t
: allow moving
the
r
oot tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
fast-impor
t
: allow ls
o
r file
c
opy of the roo
t
tr
e
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
J
o
h
n Kee
p
ing
fast-im
p
ort:
set valid mode on ro
o
t t
r
ee in "ls
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-23
John K
e
eping
t930
0
: document fast-import
empty
p
a
th i
s
s
ue
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keepin
g
submodule: drop the
t
op-leve
l
r
e
qu
i
rement
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
rev-
p
a
r
se: add --prefix
o
ption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodul
e
: show full path in error message
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403: add
m
issing
&
& chaining
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn Keep
i
ng
t7403: moderni
z
e
s
t
yle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keepin
g
t
7
401
:
ma
k
e inden
t
ati
o
n consistent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
merget
o
ol
-
-lib: refact
o
r {diff,merge}_cmd l
o
gi
c
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eeping
Documentation/
M
a
k
e
f
ile: move infodir
to b
e
with other
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eepin
g
Docum
e
nt
a
t
ion
/
Makefile: fix s
p
ac
e
s around
a
s
s
ignments
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-12
J
ohn Keep
i
ng
add--interactiv
e
: respect diff
.
algor
i
t
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-06-07
Jo
h
n K
e
epin
g
git
-
gui: fix file name handling with non-empty prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-28
Jo
h
n Keeping
fetch: d
o
n't try to
update un
f
etched tracking
r
e
fs
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
John Kee
p
ing
d
iff
t
ool: f
i
x dir-diff
w
h
e
n
f
ile does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
ohn Keep
i
ng
merge-tree: hand
l
e d
i
rec
t
ory/empty
conflict
correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-06
John Keepi
n
g
t/Makefile: don't define TE
S
T_RESULTS_DIRECT
O
RY recursi
v
ely
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
c
ontri
b
/sub
t
ree: don't delete remo
t
e branc
h
es if sp
l
i
t
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-29
John Keeping
test output: respec
t
$TEST_OUT
P
UT_DI
R
ECTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makef
i
le
:
r
e
mov
e
s
moke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
h
n Keeping
m
erge-tree
:
fix
t
ypo i
n
"both ch
a
nged identica
l
l
y
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile: fix result hand
l
ing with
T
EST_OUT
P
UT
_
DIR
E
CTORY
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transpo
r
t-helper: add
'signed-tag
s
' ca
p
a
b
ility
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Keeping
t
ranspor
t
-
helper: pas
s
-
-si
g
ne
d
-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
fast-export:
add --
s
igned-
t
a
g
s=warn
-
strip mod
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn
K
eeping
t/test-lib
.
sh: fix TR
A
S
H
_DIRECTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
Jo
h
n
K
eeping
merge-tree:
d
o
n't pri
n
t
en
t
r
ies that
match "local
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Kee
p
ing
gitremote-h
e
lpe
r
s(1): clarif
y
refsp
e
c
beha
v
iour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John K
e
eping
submodule: prin
t
graph outpu
t
next
t
o submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff:
allow
u
nst
u
ck
arguments with --diff-alg
o
ri
t
hm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Keeping
git-merge
(
1): documen
t
diff
-
algorit
h
m op
t
i
o
n
to
merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bi
s
ect: avoid
s
i
gn
e
d integer ov
e
rflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diffcore-
b
r
ea
k
: don't divide by
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eep
i
ng
t7800:
r
un --dir-diff t
e
sts
with and
w
i
thout symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00: fix
t
e
s
ts when di
f
ft
o
ol u
s
es --
n
o-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
eping
t
7800: don't
h
ide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
d
i
fftool:
d
o
n't ove
r
write modified fi
l
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Ke
e
p
ing
t7800: mo
v
e '--sy
m
li
n
ks'
specific te
s
t to
t
he end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn Kee
p
ing
merge-tree: fix typo in merge-tr
e
e
.
c
:
:unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fi
x
fr
e
ad error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn
Keeping
entr
y
: fix filter l
o
okup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2
0
03: mod
e
rnize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
dif
f
tool
-
-dir-diff: symlink
all files
m
atchin
g
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: av
o
id
double slashes in symlin
k
targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
git-difftool(1): fix formatting
of --symlink
d
escription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
o
hn Keeping
Revert "graph
.
c: mark
p
rivate file-s
c
ope s
y
mbols a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
M
a
kef
i
le: make man
d
ir, htmldir and i
n
fodir abso
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i: r
e
spect
c
ore
.
commen
t
char
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
combine-diff
.
c: teach combin
e
d diffs about line
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keeping
diff
.
c: use diff
_
line
_
prefix() where applicable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add diff_line
_
prefix funct
i
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
diff
.
c: make
con
s
tan
t
string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
diff: write prefix to t
h
e cor
r
ect fi
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Jo
h
n Keeping
graph: output padding for merge subsequ
e
nt
parents
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 --raw <tre
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: t
i
g
h
ten (
d
is)
s
imilarity
i
n
d
ex parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
mergetool--lib: list user configured
t
ools in '--
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git-
=
>
g
it}r
e
mote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Coding
G
uidel
i
n
e
s
:
a
dd Python coding guidelin
e
s
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Keepi
n
g
git-remote-testpy:
f
ix p
a
th hashing on Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn Keeping
mergetool--lib:
do
n
't
call "exit" in set
u
p
_
tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-
d
i
f
fto
o
l: use git-mer
g
etool--li
b
for
"-
-
t
o
o
l
-
h
elp
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eepi
n
g
git-mergetool: don't hardcode 'm
e
r
getool' in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-mergeto
o
l: r
e
move redundant assignm
e
nt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-m
e
rgetool: move
show_too
l
_help to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-remo
t
e
-testpy: call print as
a functio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
i
ng
git-remote-testpy: don't
do un
b
uffe
r
ed text I/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-testpy:
h
a
sh bytes exp
l
icitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
svn-fe: allow
s
vnrdump_sim
.
py to ru
n
w
i
th Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n K
e
epin
g
git_remote_
h
e
lp
e
rs: us
e
2to3 if bu
i
ldin
g
w
i
th P
y
t
h
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
g
it_remote_helpers: force rebuild if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
ohn Keeping
git-cvsimport
.
txt: cvsps-2
is d
e
precate
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-for-each-ref
.
txt: 'raw' is a supported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote_helpers: fix inp
u
t when running under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
next