repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: Explain git-mergetool's use of temporary files
2010-07-19
D
a
vid A
g
uilar
Documentat
i
on: Explain
g
it-mergetool's use o
f
t
emp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makef
i
le: Remove u
s
age of deprecated Python
"
has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '--gui'
when diff
.
guitool is un
c
onfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguil
a
r
t
7
8
0
0-dif
f
tool
.
sh: Te
s
t mergetool
.
promp
t
f
a
l
l
back
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id Aguilar
dif
f
tool: Update copyright notices to list each y
e
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avi
d
Aguilar
difftool: Use eval
t
o expand '--
e
x
tc
m
d' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
d
i
fftool:
Add '-x' and as
an alias for '--extcmd
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
t780
0
-difftool
.
sh: Simplify
t
h
e
--extcmd
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git
-
diff
.
txt: Link t
o
git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
ffto
o
l: Allow
s
pecifying un
c
o
n
fig
u
red commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
diffto
o
l--helper:
R
e
move use of the G
I
T_MERGE_TOO
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fftool--helper: U
p
da
t
e
copyright
a
nd remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguilar
git-difftool: Add '--gui' fo
r
select
i
ng
a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
i
l
ar
t7800-d
i
ff
t
ool:
Set a bogus to
o
l for u
s
e by test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
v
id Agui
l
ar
help: Do
n
ot unnecessarily look
f
or
a
repo
s
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid A
g
uilar
subm
o
d
u
le
.
c: Squelch a
"use before assignment"
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Ag
u
ilar
diff: gener
a
te pretty filenames in prep_temp_b
l
ob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Agu
i
lar
compat:
a
d
d a
b
ase
n
ame() compati
b
ility
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
compat: add a mkstemps()
c
ompatibility
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avi
d
Aguilar
A
dd git-r
e
place
to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
a
vid Aguilar
merg
e
t
o
ol--lib: a
d
d suppor
t
f
o
r
araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid Aguilar
m
ergetoo
l
--lib: speciali
z
e
diff optio
n
s for e
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
A
guil
a
r
mergetool-
-
lib: simp
l
if
y
API usage by removing mo
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difft
o
ol/mergetool: refactor comma
n
ds
t
o
use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguil
a
r
mer
g
etool: use $(
.
.
.
) instead of
`
backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completion: ad
d
g
i
t-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
diff
t
ool
:
a
dd
s
up
p
ort for a d
i
f
f
t
ool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
d
ifft
o
ol: add various
gi
t
-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
diff
t
ool: move 'gi
t
-di
f
ft
o
ol' ou
t
of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agui
l
ar
difftool: add a -y shor
t
cut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: use perl built-ins whe
n
testin
g
f
or
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguilar
d
ifft
o
ol:
r
emove th
e
back
u
p
file
f
e
a
t
ure
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
difftool: remove
merge options for o
p
end
i
f
f, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Agu
i
lar
e
v
eryd
a
y:
u
se the dashless f
o
r
m
of git-i
n
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Agui
l
ar
c
ontr
i
b/diff
t
ool: use a separate c
o
nfig namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d Aguilar
co
n
trib/
d
ifftool
:
Don
'
t repeat m
e
rge to
o
l candid
a
tes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d
Aguilar
difftool: put the cursor on t
h
e e
d
itable file
f
o
r Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
uil
a
r
d
ifftool:
f
ix
docu
m
entation prob
l
ems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguila
r
contrib: a
d
d
'
git diff
t
ool' for launching common
m
er
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David
A
guilar
git-m
e
rgetool: properly handle "git mergeto
o
l
-- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add a test
c
a
s
e fo
r
"git s
u
bmodule sy
n
c"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Ag
u
i
l
ar
git-s
u
b
module: ad
d
"sync"
comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Ag
u
ilar
gi
t
-s
u
bmodule: r
e
pl
a
ce
d
uplicated code with a module_lis
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[
P
ATCH] gitk: Don'
t
s
how local
c
ha
n
g
es w
h
en we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree