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 'al/mergetool-printf-fix' into maint
2013-02-10
Da
v
id Aguilar
difftool--helper: fix pri
n
tf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
me
r
getools/p4merge: Hon
o
r
$
TM
P
DIR for
t
he
/
d
e
v
/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid Aguilar
mergetools/p4merg
e
: Handle "/dev
/
null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
merge
t
ool-
-
lib:
A
llow cu
s
tom commands t
o
ov
e
rride built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id Aguilar
gitk:
Rename 'tag
c
ontents' to 'c
a
ched_tagcontent
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
Agu
i
lar
gitk: Teach "Reread references" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguila
r
m
erge
t
ool,diff
t
ool:
D
ocu
m
ent --tool-
h
elp c
o
nsisten
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disable -
-
sym
l
inks on
cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
l
a
r
d
ifftool
:
Hand
l
e compare() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d A
g
uilar
difftool:
Wrap
l
ong
l
in
e
s for readabili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difft
o
ol: Che
c
k all return codes from
c
o
mp
a
re()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
v
id Aguilar
diff
t
ool: Handle finding mergetools/ in a
p
ath
w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
av
i
d Aguilar
difftool:
U
se s
y
mli
n
k
s when di
f
fing
a
gainst the wo
r
ktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
d
i
fftool:
C
a
ll the tem
p
d
i
rectory
"
git-diff
t
ool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
g
u
il
a
r
difftool:
M
ove option values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id
A
gui
l
ar
difftool: Elimi
n
ate glob
a
l variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool:
S
imp
l
i
fy
print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
a
vid Agui
l
ar
t7800: Test difftool passing arguments to
d
i
f
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Davi
d
Aguil
a
r
me
r
getool: P
r
ovide an em
p
ty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
M
akefi
l
e: Improve
c
ompiler
h
ead
e
r dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
merg
e
tool
s
/meld:
U
s
e '
-
-o
u
tput' when
av
a
il
a
ble
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
mergetoo
l
--li
b
: Refactor tools into sepa
r
ate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
mergetool-
-
lib: Make style consis
t
en
t
with gi
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
dif
f
tool--helpe
r
: Make s
t
yl
e
c
o
nsistent
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Davi
d
Agui
l
ar
t/t7503-pre-comm
i
t-hook
.
sh
:
Ad
d
GIT_PRE
F
I
X tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t-
m
ergetool--li
b
: Make vi
m
di
f
f reta
i
n t
h
e current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git:
R
emove handling fo
r
G
IT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
s
e
tup:
P
rovide GIT_PREF
I
X to
b
uilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
id Aguilar
submodule sync: U
p
dat
e
"submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
avid Agui
l
a
r
mergetool: Sk
i
p autoresolved p
a
ths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation: Explain gi
t
-me
r
geto
o
l'
s
use o
f
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Re
m
ove usage of deprecate
d
Pytho
n
"
h
a
s_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Ag
u
ilar
d
i
f
ft
o
ol
:
Fix '
-
-gui' wh
e
n
d
iff
.
gui
t
o
o
l is unconf
i
gured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t
7
800-
d
i
f
ftool
.
sh: Test merg
e
tool
.
prompt
f
allba
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid Aguilar
diff
t
ool: Up
d
ate copyright
notices
t
o
l
i
s
t each y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
ifftool:
U
se
eval to expand '--
e
xtcmd' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
d
ifftool
:
Add '-x
'
and as an al
i
as for
'--e
x
tcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Agu
i
l
ar
t7800-difftool
.
s
h: Si
m
p
l
i
f
y t
h
e
-
-
extcmd
t
est
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt: Link to git
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
difftool: Allow sp
e
cifying
u
ncon
f
igure
d
comm
a
nds wit
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
gu
i
lar
difftool--hel
p
er:
R
e
move use of
the GIT_MERGE
_
TO
O
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool--helper: Upda
t
e
c
opyright and remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguilar
git-dif
f
tool: Add '-
-
g
u
i'
for sel
e
cting a GU
I
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid
A
guilar
t
780
0
-diff
t
ool: Set a bog
u
s
to
o
l for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not unnecessarily l
o
o
k f
o
r
a
repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David
A
g
u
ilar
subm
o
dule
.
c:
S
q
u
elch a "use before assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
A
g
uilar
diff: generate pretty filen
a
me
s
in prep_t
e
mp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
co
m
pat: add a basenam
e
() comp
a
tibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
A
guilar
c
ompat: add a mkstemps()
compatibili
t
y
f
un
c
tio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Ag
u
il
a
r
A
d
d git-re
p
l
ace to
.
gitig
n
ore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d Aguila
r
mer
g
etool--lib: add suppo
r
t
for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
A
guilar
merget
o
ol--lib: s
p
ec
i
al
i
ze diff options for em
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Agu
i
l
ar
m
ergetool--lib:
simp
l
if
y
API usa
g
e by rem
o
vi
n
g
more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool/mergetool: refactor commands to
u
se
g
it-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
mergetool: use $(
.
.
.
) instead of `backtick
s
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
bash
c
ompletion: add g
i
t-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
di
f
ftool: add support fo
r
a difftoo
l
.
p
rompt
c
onfi
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool:
a
dd various
git-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
d
if
f
tool: m
o
ve 'git-difftool' out
of c
o
n
tri
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agui
l
ar
difftool: add a -
y
shortcut for --no-
p
rompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difft
o
ol: u
s
e perl bui
l
t
-ins when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Agu
i
lar
di
f
ftool: rem
o
ve the ba
c
kup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guila
r
di
f
fto
o
l
: remove mer
g
e options fo
r
o
pendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Agu
i
lar
every
d
a
y:
u
se the dashless for
m
of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/difftool: use
a
sep
a
rat
e
config namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Agui
l
ar
contr
i
b/diff
t
ool:
D
on
'
t
repeat mer
g
e tool
candi
d
ates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
diff
t
o
ol: put the cu
r
sor
o
n the edit
a
ble file for V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
di
f
ftool: fi
x
d
o
cu
m
entation proble
m
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
i
d Agui
l
a
r
con
t
r
i
b:
add 'git difftool' for launch
i
ng
c
ommon
mer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David
A
g
uilar
git-merg
e
tool: properly
h
andle "git
m
ergeto
o
l
-- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Da
v
id Aguilar
tests: a
d
d a testcase
for "git submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Dav
i
d Aguil
a
r
git-s
u
bmo
d
ule: add "
s
ync" com
m
and
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Agu
i
lar
git-submodule:
r
e
p
lace duplicated co
d
e with a
m
o
dule_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
av
i
d Aguilar
[PA
T
CH] gitk: Don't show lo
c
al changes when w
e
there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree