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 'jc/mailinfo-RE'
2012-09-09
David Aguilar
gitk:
R
ename 'tagcontent
s
' to 'cached
_
tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d
A
gu
i
lar
gitk: Teach "
R
eread references" to re
l
oad ta
g
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
a
vi
d
Aguilar
m
e
rgetool
,
difftool: Do
c
u
m
ent --tool-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguila
r
difftool
:
Disable --symlinks o
n
cygw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid
Agu
i
lar
di
f
f
t
o
ol: H
a
nd
l
e
c
ompare()
returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
g
u
il
a
r
difftool:
Wrap long
l
ines for readabilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difft
o
ol: Check
a
ll retu
r
n co
d
es from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
difftool
:
Handle fi
n
d
ing mergetools/ in a p
a
th with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Aguilar
di
f
ftool: Use symlinks when diffing agains
t
the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
Aguila
r
difftool: Cal
l
the t
e
m
p directory "gi
t
-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
d
ifftool: Move option
v
a
l
ues into
a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguil
a
r
diffto
o
l: Elim
i
n
at
e
global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Agu
i
lar
diff
t
oo
l
: Simplify print_tool_help
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Agui
l
ar
t
7
800: Test difft
o
ol passing argum
e
nts
t
o diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Agu
i
l
a
r
m
e
r
g
etool: Prov
i
de an empt
y
file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David A
g
uilar
Mak
e
file: Im
p
r
o
ve compi
l
er header
d
e
pendency chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
me
r
getools/meld: Use '-
-
out
p
ut' w
h
en available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
mergetool--lib: Refact
o
r
t
oo
l
s
into separ
a
te file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
rgetool--lib
:
Mak
e
style consisten
t
wi
t
h git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
di
f
ftool--helper
:
Make s
t
yle consiste
n
t
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
id Aguilar
t
/
t7503
-
pre-c
o
mmit
-
hook
.
sh
:
Add GIT_PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
g
it
-
mergetoo
l
--lib: Make vimdi
f
f re
t
ain the cu
r
rent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
l
a
r
git: Remov
e
h
andling
f
or
G
IT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
A
g
uilar
se
t
up: Pr
o
vide GIT_P
R
EFIX to built-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
s
u
bmodule sync: U
p
date "sub
m
o
d
ule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
a
v
id Aguilar
m
e
rgeto
o
l: Ski
p
autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentatio
n
:
Explain
g
it-mer
g
etoo
l
'
s
use of
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Re
m
ove
us
a
ge o
f
deprecated Python "has_
k
ey
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Agui
l
a
r
difftool: Fix '--gu
i
' when
di
f
f
.
guitool
is unconfigure
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguil
a
r
t7800-difftool
.
s
h: Test mergetool
.
p
rompt fa
l
lback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftoo
l
:
U
pdate
c
o
p
yri
g
ht notices t
o
l
i
st ea
c
h year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Agui
l
ar
d
i
fftool
:
Use
e
v
a
l
t
o expand
'--e
x
tcmd
'
ex
p
r
e
s
s
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
id Agu
i
lar
difftoo
l
: A
d
d '-x' and as an alias for '--extc
m
d'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
t7800-d
i
ffto
o
l
.
sh: Simplify the --
e
xtcmd
t
est
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Aguilar
git
-
diff
.
txt: Link
t
o git-
d
i
fftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
difftool: All
o
w
specifyi
n
g
unconfigured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguila
r
difftool--h
e
lper: Remov
e
us
e
of t
h
e GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
d
ifft
o
o
l--helper
:
U
p
date copy
r
ight an
d
r
emove distra
c
ti
n
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguila
r
git-diffto
o
l: Add '--gui' f
o
r se
l
ecti
n
g a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
v
id Aguilar
t78
0
0-
d
i
f
ftool: Set a bog
u
s tool
for use by te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid
A
guilar
help: Do not u
n
necessarily
l
ook for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submo
d
ule
.
c:
S
quelch a "us
e
b
e
fore assignment"
warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
diff: generat
e
pretty filena
m
es in prep_temp
_
bl
o
b
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
o
mpat: add a basename() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
compat: add
a mkst
e
m
p
s() com
p
at
i
b
i
lit
y
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
Add git-r
e
place
t
o
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Agu
i
l
a
r
m
e
r
getool-
-
li
b
: ad
d
support
for
a
raxis
merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguil
a
r
merge
t
o
ol-
-
li
b
:
specialize diff
o
p
t
i
o
ns fo
r
em
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetoo
l
--lib: simplify API usage
by remov
i
n
g
more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
gui
l
a
r
difftool/mergetool: refacto
r
commands to
u
se git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
m
e
rgetool: use $(
.
.
.
) instead o
f
`ba
c
kticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash
c
ompletion:
ad
d
git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: add support for a difftool
.
promp
t
config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool
:
add various git-difftoo
l
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ft
o
ol: move
'
git-diffto
o
l' ou
t
of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
i
fftool: add a -y shortc
u
t for --
n
o-p
r
ompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool: u
s
e
perl bu
i
lt-ins when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Ag
u
ilar
difftool: remove th
e
backup fil
e
f
e
ature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
iff
t
ool: remove merge
options for opendiff, t
k
diff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id
Aguilar
everyda
y
: u
s
e
the das
h
less f
o
rm
o
f git-i
n
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Aguilar
c
o
ntrib/dif
f
t
ool: use a
se
p
arate c
o
nf
i
g
n
amespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Ag
u
i
lar
c
o
ntr
i
b
/d
i
fftool
:
Do
n
't
r
epeat merge tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguil
a
r
difftool: p
u
t the cursor on
t
he editable fil
e
fo
r
Vi
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: fix documentation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Dav
i
d Aguilar
c
o
ntrib: add 'gi
t
difftool' for launc
h
ing com
m
on m
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
g
i
t-mergeto
o
l: properly handle "git
m
e
r
geto
o
l -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Davi
d
Aguilar
tests
:
add a testcase for "git submodule
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguil
a
r
g
i
t-sub
m
o
dule: add "sync" comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Aguilar
git-submodule
:
r
eplace dup
l
icated code
w
ith
a
m
odule_li
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Da
v
id Aguilar
[PATCH]
gitk: Don't sh
o
w local ch
a
nges
when we t
h
ere
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree