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
Makefile: keep LIB_H entries together and sorted
2013-02-10
David Agu
i
lar
p4mer
g
e
:
fix prin
t
f
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
A
guilar
di
f
ft
o
o
l
--helper: fix prin
t
f usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Aguilar
merget
o
o
ls/p4merge: Honor
$T
M
PDIR for the /dev/n
u
ll
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mer
g
etool
s
/p4merge: Han
d
le
"/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Davi
d
Aguilar
mergetool-
-
lib: Allo
w
custom c
o
mmands to overr
i
d
e
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
gitk: R
e
name 'tagc
o
ntents' to 'ca
c
hed_tagcont
e
nt'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
v
id
A
guilar
gitk: Te
a
c
h
"
R
ere
a
d references" t
o
reload ta
g
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id Aguila
r
m
e
rg
e
tool,
d
ifftool: Document --tool-help con
s
i
s
t
en
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disable
-
-
s
y
mlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
d
ifftool: Han
d
l
e
compar
e
() returni
n
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Wrap
l
ong lines for r
e
adabilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
difftool:
Check all return c
o
des
f
rom compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguila
r
d
i
f
f
t
ool: Handle
f
ind
i
ng mergetools/
i
n
a
path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguil
a
r
difftool: Use
syml
i
nks
w
hen diffing aga
i
nst the
w
orktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
diff
t
oo
l
:
Call the temp
directory "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Ag
u
ilar
dif
f
tool: M
o
ve option values into a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
difftool: Eliminate gl
o
b
a
l var
i
a
bles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
Agui
l
ar
difftool: Simp
l
ify print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Da
v
i
d
Ag
u
ilar
t7800: T
e
st difftoo
l
passing arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool:
P
r
ovi
d
e
a
n
empt
y
f
ile when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
avid A
g
uilar
Makefile: Impr
o
v
e com
p
iler
h
ead
e
r depen
d
e
n
cy chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
g
uilar
m
e
rge
t
ools/meld: U
s
e '--output' when avai
l
able
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib
:
Re
f
actor
too
l
s
int
o
separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
mergetool--lib: Ma
k
e style consistent
w
i
th g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
A
guilar
difftool--helper: Make st
y
le consi
s
tent with g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
ilar
t/t
7
5
0
3
-
pre-com
m
it-hook
.
sh:
A
d
d
G
IT_PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-merg
e
t
o
ol--lib: Make vimdiff retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove h
a
ndling
fo
r
GI
T
_PRE
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
il
a
r
set
u
p: Provi
d
e
G
IT_
P
REFIX to b
u
ilt-
i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
id A
g
uilar
sub
m
odule sync: Update "subm
o
du
l
e
.
<
n
a
me>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Agui
l
ar
me
r
getool: S
k
i
p
autoresolved p
a
ths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
av
i
d
A
guilar
Documentati
o
n:
Ex
p
l
a
i
n
git-merg
e
tool
'
s
use
o
f
tempora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Aguilar
Makefile: Re
m
ove u
s
age of depreca
t
ed
P
y
t
ho
n
"has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
diff
t
ool: Fix
'
--gui' when
d
iff
.
guitoo
l
is u
n
configur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Agu
i
l
ar
t7
8
00-difftool
.
sh:
Test m
e
rgetoo
l
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
u
i
l
ar
difftool: Upda
t
e copyright no
t
ices
to lis
t
each yea
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
diff
t
ool:
U
se eval
t
o ex
p
and
'--ex
t
cmd'
ex
p
ressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
g
u
i
lar
d
i
fftool: A
d
d '-x' and a
s
an alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t780
0
-diff
t
ool
.
s
h:
Simplify the
--extcm
d
te
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
git
-
diff
.
txt: Link to gi
t
-
d
i
fft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
g
uilar
difftool: Allow specifying
unconf
i
gured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
difftool--helper: R
e
mov
e
us
e
of the
G
IT_MERGE_T
O
OL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
di
f
ftool--helper
:
Upd
a
te copyright
and remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
ar
git-
d
ifftool: Add
'
-
-gui'
f
o
r selecting a
GUI t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t
7800-difftool:
S
et
a
bo
g
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 look fo
r
a repo
s
i
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d Agu
i
lar
submodule
.
c: Sque
l
ch a
"
use before assignm
e
nt" warnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
diff: gen
e
rate
p
ret
t
y fi
l
e
name
s
in pre
p
_temp_
b
lob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
comp
a
t: add a basename(
)
comp
a
tibil
i
t
y function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
Aguilar
com
p
at:
add a mks
t
em
p
s() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
Add
g
it-repl
a
ce to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid
Aguilar
m
ergeto
o
l--l
i
b
: add
s
u
p
p
o
r
t
for arax
i
s m
e
rge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d Agu
i
lar
mergetool--lib
:
specializ
e
dif
f
opti
o
n
s
fo
r
e
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
merge
t
ool--lib: simplify API usage by removi
n
g more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftoo
l
/mer
g
etool: ref
a
cto
r
comm
a
nds to use
git-merg
e
too
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
mergetool: use $(
.
.
.
) instead
of `ba
c
kticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Ag
u
ila
r
bash
compl
e
tion: add git
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
diffto
o
l: add
support for a difftool
.
prompt co
n
f
i
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
difftool: add various
g
i
t
-
d
ifftool te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: move 'git-d
i
fftool' out
of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
i
lar
difft
o
ol
:
add a -y shortcut
f
o
r --no-p
r
ompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: use
p
erl b
u
ilt-ins when test
i
ng for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool: remove the ba
c
ku
p
file f
e
ature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
dif
f
t
o
ol: remove me
r
ge
o
p
t
i
ons for opendiff,
tkdi
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id A
g
uilar
everyday: use the dashless f
o
rm of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib
/
difftoo
l
: use a separate
c
on
f
ig namespa
c
e for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David
A
guila
r
contri
b
/difftool: Don't repeat merg
e
tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
av
i
d Ag
u
i
l
ar
diffto
o
l: put the cursor on the edi
t
able fil
e
for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: fix documen
t
a
t
ion pr
o
blems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Agui
l
ar
contrib:
add 'git
difftool
'
for launch
i
ng
c
ommon me
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David
A
guilar
git-mergetool:
properly handl
e
"git mergetool --
f
i
lename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add a testca
s
e for "git submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guilar
g
it-su
b
module: add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule:
r
eplace dup
l
icat
e
d co
d
e wi
t
h a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Agui
l
ar
[PATCH] gitk: Don'
t
show local c
h
anges whe
n
we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree