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 'pe/pull-rebase-v-q' into maint
2013-04-16
David Agui
l
ar
help
.
c: add
a
c
om
p
at
i
bility c
o
mment to
cmd_versi
o
n()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d
Aguilar
contr
i
b/
m
w-to-
g
it/t/
i
nsta
l
l-w
i
k
i
.
sh: use
a
lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d
A
guilar
contrib/
e
xampl
e
s/git-remote
.
p
erl: us
e
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
tests: u
s
e a lowercas
e
"
usage
:
" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
git-svn: use a lowe
r
case
"
usage:"
s
tr
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
A
guil
a
r
Document
a
tion/user-manual
.
txt: use
a l
o
wercase "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
Aguilar
templ
a
tes/hooks--u
p
date
.
s
ample: use a
l
o
w
ercase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguila
r
co
n
t
rib/ho
o
ks/setgitpe
r
ms
.
perl: us
e
a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/examples: use
a
lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
cont
r
ib
/
fast-imp
o
rt/impo
r
t-z
i
ps
.
py: use
spaces inst
e
ad
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
contrib/fast-imp
o
rt/import-zips
.
p
y: fi
x
br
o
k
en error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
co
n
trib/f
a
st-
i
mport: use a low
e
rcase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agu
i
lar
c
o
ntri
b
/credential
:
use
a
lowercase "usa
g
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agui
l
ar
git-cvsimport: use a
l
owercase
"usage:"
s
t
rin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
la
r
git-cvsimport: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-cvsexportcommit:
u
s
e
a low
e
rca
s
e "usage:" s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-archimport: use a lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
ilar
g
i
t-m
e
rge-one-file: use a lowerc
a
se "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
r
elink: use a lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
g
i
t-sv
n
: use a
l
owercase "
u
sage:
"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
g
i
t-sh-setup: use a lowercase "
u
sage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
id Aguilar
p4merge: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
ilar
di
f
ftool--helper: fix printf u
s
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ilar
d
o
c: g
e
nerat
e
a list of
v
a
l
id merge
t
o
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
Aguil
a
r
m
ergetool--
l
ib: add f
u
nctions
f
or fin
d
ing availab
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
mergetool--
l
ib: improve t
h
e
help text in guess_mer
g
e_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--
l
ib: si
m
plify command exp
r
essions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
me
r
getools
:
sim
p
lify h
o
w we handle
"vim
"
and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
A
guilar
me
r
geto
o
l-
-
lib: imp
r
o
v
e
show_too
l
_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/vim
:
remove redun
d
a
nt diff co
m
m
and
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Da
v
i
d Aguilar
me
r
getools/p
4
m
erge: Honor
$
TM
P
DIR f
o
r
t
h
e /de
v
/nul
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Agui
l
a
r
mergetoo
l
s/p4merge: Ha
n
dle "/dev
/
n
ul
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Ag
u
ilar
mergetool--lib: Allow custom
c
omm
a
nds to
o
verride built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id
Ag
u
ilar
gi
t
k: R
e
name
'tagcontents' to 'cached_tagconten
t
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agui
l
ar
gitk: Te
a
c
h "Re
r
ead references" t
o
reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David
A
guilar
merget
o
ol,difftool: Document --
t
oo
l
-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
l
a
r
difftool
:
Disab
l
e
-
-
s
ymlinks on cy
g
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ilar
d
i
fftool:
H
an
d
le
c
ompare()
r
eturning
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
di
f
ftool: W
r
ap
l
ong li
n
es for readabili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool
:
Check all return
codes
from
compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id
Aguilar
difftool:
Handle finding me
r
getools/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
A
g
uilar
d
iff
t
ool: Use symlin
k
s when di
f
fing against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Call the temp directory "g
i
t-diffto
o
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool:
Move option values i
n
to
a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool:
E
l
im
i
n
a
te gl
o
bal variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
f
ftool:
Simplify print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t
780
0
:
T
est difftool
pa
s
s
i
ng arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool: Provi
d
e a
n
empty
f
il
e
when
needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David A
g
uilar
M
a
k
e
file: Im
p
rove compil
e
r h
e
a
der dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Ag
u
ilar
m
e
rge
t
ools/me
l
d: Use '--output' w
h
en available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
merge
t
ool--
l
i
b: Refact
o
r tools in
t
o separat
e
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
m
ergetool--li
b
: Mak
e
style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
A
guilar
difftool--he
l
per:
Make style co
n
sist
e
nt
w
ith git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguila
r
t/t7503-pr
e
-commit-
h
ook
.
sh: Add GIT_PREFIX te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t-m
e
rge
t
ool--lib: Make vimdiff retain the c
u
r
r
e
nt
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
g
u
ilar
g
i
t: Remove han
d
ling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
s
e
tup
:
Provide GIT_PREFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
s
ubmodule sync: Update "
s
u
b
module
.
<
name>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguila
r
mergetool:
S
kip autoreso
l
ved pa
t
hs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Aguilar
Documentation: Explain git-mergetool'
s
use of te
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d
Aguilar
M
a
kefile: Remove usage of deprecated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '-
-
gui' when di
f
f
.
guitool is u
n
c
onf
i
gu
r
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id Aguilar
t
7
800-d
i
ffto
o
l
.
sh: Test mergetool
.
pro
m
pt fa
l
lback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Dav
i
d
A
g
u
i
lar
difftool:
U
pdate copyri
g
ht notices
t
o
l
i
st each
y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
ifftool: Use e
v
al to expan
d
'--ext
c
md'
e
xp
r
essions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
difftool:
A
dd
'
-x' and as an al
i
as for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Agui
l
a
r
t780
0
-diff
t
oo
l
.
sh: Simplify the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id
A
guilar
git-diff
.
txt
:
Link to git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
i
d A
g
uilar
difftool: Allow specifying unconfigured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vi
d
Aguilar
difftoo
l
--helper:
R
e
mo
v
e use of
the GIT
_
MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id
A
guilar
d
iff
t
ool-
-
h
elpe
r
: Update copyright and
r
emove
distractin
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
git-
d
ifftool: Add '--gui' f
o
r
selecting a G
U
I
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid A
g
uilar
t7800
-
difftool:
S
et a
bogus tool
f
or use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguil
a
r
help: Do
n
ot unn
e
cessarily look for
a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Agu
i
l
a
r
sub
m
odul
e
.
c: Squelch a "use
b
efo
r
e
assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
uilar
diff: ge
n
era
t
e pretty
f
ilenames in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avi
d
A
g
uilar
compat: add a
basename
(
) compatibility funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
compat: add a mkste
m
ps() compat
i
b
i
lity
functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
Add git-replac
e
to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
me
r
g
etool--lib: add s
u
p
p
o
rt
f
o
r
araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
u
ilar
mergetoo
l
--lib: sp
e
cialize diff options
for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
a
v
id
A
guilar
m
e
rgetoo
l
--li
b
: sim
p
lify API usage by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/merget
o
ol: r
e
fa
c
t
o
r commands to use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
m
e
rg
e
tool: use $(
.
.
.
) inst
e
ad of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguila
r
bash completion: a
d
d git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
il
a
r
difftool: add suppor
t
for
a difftool
.
prompt c
o
nfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool: add various git-difftool t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool:
move 'git-difftool' out of c
o
ntrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool: add a -y sho
r
tcut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
diffto
o
l: use perl
built-ins w
h
en testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
dif
f
tool: remove the backup fi
l
e fe
a
ture
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guila
r
di
f
ftool: remove
m
erge op
t
i
ons for
o
p
endiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
every
d
ay:
use t
h
e
d
a
s
hless form of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Aguilar
contrib/difftool: use a separate config namespa
c
e for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Da
v
id Agui
l
ar
contrib/d
i
f
f
too
l
: D
o
n't repeat merge
tool
candi
d
a
t
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
diff
t
ool:
p
ut the
cursor on t
h
e editable file f
o
r Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: fix documentati
o
n p
r
obl
e
ms
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Agu
i
l
a
r
contrib: add 'git
d
ifftool' f
o
r launch
i
ng common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-merg
e
tool:
p
rope
r
ly handle "git mergetool -- file
n
ame
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
a
vid Aguilar
t
e
sts
:
add a te
s
tcase for "git submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next