repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: Use symlinks when diffing against the worktree
2012-07-23
Da
v
id Agui
l
ar
difftoo
l
:
U
se symlin
k
s when diffing again
s
t the wor
k
t
ree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d
A
guilar
diff
t
o
o
l: Call the tem
p
d
i
recto
r
y
"
gi
t
-diff
t
ool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftoo
l
: Move option values into
a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
u
i
la
r
di
f
ft
o
ol: E
l
iminat
e
global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
difftool: Simpli
f
y prin
t
_too
l
_
h
elp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d Aguilar
t7800: Te
s
t
di
f
ftool passing arguments
t
o diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Aguilar
merget
o
ol: Provide an empty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Aguilar
Makefil
e
:
Improve
compiler h
e
ader
d
ependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid
Aguilar
m
erget
o
ols/meld: Use
'
--output' whe
n
avai
l
able
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
m
ergetool--lib
:
Refactor tools into
s
eparat
e
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguila
r
m
e
rgetoo
l
--lib
:
Make
s
ty
l
e
c
o
nsis
t
ent wi
t
h git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
v
i
d Aguilar
difftool--hel
p
er: Make st
y
le consiste
n
t
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d Agui
l
a
r
t
/
t
7503-pre-commit-hook
.
sh:
A
dd GIT_
P
REFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
git-me
r
g
e
to
o
l--lib: Make vim
d
if
f
retain the cu
r
ren
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guila
r
gi
t
: Rem
o
v
e
handling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avi
d
Ag
u
ilar
setup: Pr
o
vide GIT_PREFIX to
b
u
i
lt
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Agui
l
ar
s
u
b
module sync: Updat
e
"
submodule
.
<name>
.
ur
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David A
g
uilar
me
r
getool: Skip auto
r
esolve
d
paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Documentati
o
n
:
Expla
i
n git-merget
o
ol's use o
f
te
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguila
r
Makefile
:
Remove usage o
f
deprecat
e
d Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftoo
l
: Fi
x
'--gui' wh
e
n diff
.
guitool is
unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguil
a
r
t7800-d
i
ff
t
ool
.
sh: Test mergetool
.
p
rompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
i
fftool: U
p
d
a
te copyright notic
e
s
t
o
list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
i
d A
g
uila
r
difftool:
Use eval to expand '--extc
m
d' expres
s
ions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Add '-x' and as an alias for
'
--extcm
d
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftool
.
s
h: Simplify th
e
--extc
m
d test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
git-di
f
f
.
txt: Li
n
k to
git-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
d
i
fft
o
ol:
A
llow s
p
ecifyi
n
g u
n
c
o
nfi
g
ured com
m
ands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
A
gu
i
lar
difftool--helpe
r
: Remove
use of the GIT_MERGE_TOO
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fftool--h
e
lpe
r
:
Update copyrig
h
t a
n
d rem
o
ve d
i
stracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
u
ilar
git
-
difftool: Add '--gui' fo
r
s
electin
g
a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguil
a
r
t7800-
d
ifftoo
l
: Set a
b
ogus
t
ool for use by t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David
Aguilar
help: Do not
u
n
n
ecessarily lo
o
k for a
r
e
p
ository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
avid Agui
l
ar
submodule
.
c:
Sque
l
ch a "
u
se bef
o
re assign
m
e
n
t
" warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
diff:
g
e
n
erate pretty filename
s
in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguila
r
c
ompat: add a basename() comp
a
tib
i
lity f
u
n
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
co
m
pat:
a
dd a mkstemps() compatibi
l
ity f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git
-
r
e
p
l
ace
to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mer
g
eto
o
l--lib
:
add support for ar
a
x
i
s
merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Ag
u
i
l
ar
merget
o
ol--lib
:
specialize di
f
f opti
o
ns
f
or emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David A
g
uilar
mergetool--
l
ib: simplif
y
API us
a
ge by re
m
oving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergetool:
r
efac
t
or comm
a
nds to use git-mergeto
o
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
me
r
geto
o
l:
use $(
.
.
.
) instead o
f
`backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguila
r
bas
h
c
ompleti
o
n:
add git-d
i
f
f
t
oo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agui
l
ar
d
ifftool:
a
dd support for a difftool
.
prom
p
t config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Aguilar
dif
f
tool: a
d
d
v
a
riou
s
git-diffto
o
l tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Agu
i
lar
d
if
f
tool: move 'git-difftool' out of con
t
rib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Ag
u
ilar
diff
t
o
ol:
a
dd a -y shortcut for --n
o
-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguilar
diffto
o
l: use per
l
built
-
ins whe
n
t
esting fo
r
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
ui
l
a
r
difftool: remove t
h
e
backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
ff
t
ool: remove m
e
rg
e
options for opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David A
g
u
ilar
ev
e
ryday: use t
h
e dashless for
m
o
f gi
t
-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d A
g
uil
a
r
contrib/difftool: use
a separate co
n
fig namespac
e
f
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
avid Aguilar
c
o
n
trib/difftool: Don't repe
a
t
merge to
o
l
c
andidat
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftoo
l
:
put the curs
o
r on the editable
file f
o
r Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool:
fix
d
ocumentation probl
e
ms
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
v
id Aguil
a
r
contrib: add
'
g
i
t diff
t
ool' for lau
n
ching commo
n
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-me
r
g
e
t
o
o
l: properly h
a
ndle "git me
r
getool -
-
f
ilename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests
:
add a
t
es
t
c
as
e
for "git submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
gi
t
-submo
d
ule: add "sync" comm
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-s
u
bmodu
l
e:
r
eplace duplica
t
ed
code with a module
_
l
i
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH]
g
itk
:
Do
n
't show local changes w
h
en we
there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree