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 'wtk/submodule-doc-fixup'
2012-10-11
David Aguilar
merg
e
tool
s
/p4merge:
H
andle "/
d
e
v/null
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d Aguilar
merg
e
tool--lib:
A
l
low cu
s
tom commands to
o
verride b
u
il
t
-
in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agu
i
lar
git
k
:
Rename 'tagcontents'
t
o 'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agu
i
lar
git
k
: Teach "Reread
r
eferences" to reloa
d
tag
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David A
g
uilar
mer
g
etool
,
di
f
ftool: Document --too
l
-
help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
diff
t
ool: Di
s
a
ble --
s
ymlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid
Aguilar
difftool: Handle compare() returning
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Agui
l
ar
d
i
f
ftool: Wrap lon
g
l
i
nes for r
e
adabi
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
uilar
difftool: Ch
e
ck all return
cod
e
s from
c
o
mpare(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
di
f
ftool: Handle finding mergetools/ i
n
a path w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Agui
l
ar
difftool: Us
e
s
y
m
l
ink
s
when
d
iffing
against the work
t
ree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
A
g
uilar
d
i
fftool
:
Call th
e
temp directory "git
-
diff
t
ool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d Agui
l
a
r
d
ifftool: Move option values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
diffto
o
l: Elimin
a
te global var
i
a
bles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Si
m
p
l
i
fy print_t
o
ol_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
avid Aguilar
t
7800: Te
s
t difftool passing arguments
t
o
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Dav
i
d A
g
uilar
merge
t
ool: Provi
d
e an empty file w
h
en needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David
A
guilar
Makefile: Improve
compiler header de
p
en
d
ency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Agu
i
la
r
mergetools/meld: Use '--out
p
ut
'
w
h
en available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Ag
u
ila
r
mergetool--lib: Re
f
actor tools int
o
se
p
a
ra
t
e files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Agu
i
lar
merg
e
tool--lib
:
M
a
ke style co
n
sistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
di
f
ftoo
l
--h
e
lper: Make style co
n
sistent with g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
avi
d
Aguilar
t
/t7503-pre-
c
omm
i
t-hook
.
sh: Add GIT_PREF
I
X
t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetool--lib:
M
ake vimdiff retain
t
he c
u
rrent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t: Remove handli
n
g for GI
T
_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
se
t
up: Provide GIT_PR
E
FIX
to built
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d Agui
l
ar
su
b
module sync: Update
"
submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
a
v
i
d Ag
u
i
lar
merget
o
ol: Skip autoresolved pa
t
hs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid
Aguilar
Docum
e
ntation
:
E
xplain git-merge
t
ool'
s
use
o
f temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Remove u
s
age
o
f deprecated Python
"has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool:
Fix '-
-
gui' whe
n
diff
.
guitool
is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t780
0
-difftool
.
s
h: T
e
st
m
erge
t
ool
.
p
ro
m
pt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
a
v
i
d Aguilar
diff
t
ool: Update copy
r
ig
h
t notices to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
d
i
f
f
t
o
o
l: Use e
v
al to expand '--extc
m
d' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
av
i
d Aguilar
difft
o
ol: Add
'
-
x'
a
nd as
a
n
alias f
o
r '
-
-extc
m
d'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
av
i
d Aguilar
t7
8
00-difft
o
ol
.
sh: Simplify the --ext
c
md t
e
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt:
L
ink to
g
it-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
difftool: Allow specif
y
ing uncon
f
igured command
s
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
dif
f
to
o
l--he
l
per: Remov
e
use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
ifftoo
l
--helper: Update copyright and re
m
o
v
e distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
i
d
Aguilar
git-diff
t
ool:
A
d
d
'--gui' for selecting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
ar
t7800-di
f
ftool: Se
t
a bogus tool
for us
e
by
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
v
i
d Aguil
a
r
hel
p
: Do not
u
n
ne
c
essarily l
o
o
k
for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Agu
i
l
a
r
submodule
.
c
: S
q
uelch a
"u
s
e before a
s
s
i
g
nment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
diff: generate pretty
f
ilenames in pre
p
_t
e
mp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
c
o
mp
a
t: add a basen
a
me() compatib
i
lity function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a
m
kste
m
p
s() compatib
i
lity
f
unctio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add g
i
t-rep
l
ac
e
to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Agu
i
lar
mergeto
o
l--lib: add
su
p
port fo
r
araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
m
ergetool--l
i
b: specialize
diff option
s
fo
r
emerg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid
A
guilar
mergetool--lib:
s
implif
y
API u
s
a
g
e by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool/merget
o
ol
:
ref
a
ctor commands to use git-merg
e
tool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
m
e
r
getool: use $(
.
.
.
) instead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
ba
s
h complet
i
on: add git
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
Ag
u
i
l
ar
dif
f
tool:
a
dd support for a di
f
ftool
.
prompt con
f
ig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
i
fftool: add
v
ariou
s
git-di
f
ftool
test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: mov
e
'git-difftool' out of cont
r
i
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
d
ifftool: add a -y
s
hort
c
ut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
d
ifftool: use perl bu
i
lt-ins when testing for
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: remov
e
th
e
backup file
feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
difftool: remove merge
o
ptio
n
s
for opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David
A
g
uilar
everyday
:
use the dashless form of git-i
n
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
con
t
r
i
b/
d
ifftool: use a separate
c
o
nf
i
g n
a
mespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/diff
t
ool: Don't repea
t
merge tool
candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Aguilar
difftool: put the c
u
rs
o
r on
t
he e
d
itable
f
ile
for Vi
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Agui
l
ar
difftool: fix documentation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
con
t
rib: a
d
d 'git
difftoo
l
' for l
a
unching common m
e
r
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David
Aguilar
git-me
r
g
etool: p
r
operly
h
andle "git mergeto
o
l -- file
n
ame"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d
Aguilar
te
s
ts: add a te
s
tcase for "git s
u
bmo
d
ule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Davi
d
Aguilar
git-submodule: add
"sync
"
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David A
g
u
i
lar
g
it-s
u
bmodule
:
replace d
u
plicated c
o
de with a
m
odule_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David A
g
u
i
l
ar
[PATCH] gitk:
D
on'
t
sh
o
w local changes w
h
en we
t
here
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree