repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: Update copyright notices to list each year separately
2010-01-16
Da
v
id
A
gui
l
a
r
d
ifftool: Update copyright notices to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
difftool: Use eval t
o
expand '--ext
c
md' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Agu
i
lar
difftool:
A
dd '
-
x'
and as
an alias for '
-
-extcm
d
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ila
r
t7
8
00-dif
f
to
o
l
.
sh: Simplify t
h
e
-
-extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Agui
l
ar
git-
d
iff
.
txt:
L
ink t
o
git
-
d
ifftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
difftool: Allow specifying
u
nconfigured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--
h
elper: R
e
move use of
t
h
e
GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguil
a
r
difftool-
-
helper: Update c
o
p
yright
a
n
d remov
e
d
i
s
trac
t
ing
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Ag
u
i
l
ar
g
i
t-difftool: Add
'
--gui'
f
or se
l
ec
t
ing a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguilar
t
7800-difftool: Set a
bog
u
s tool
f
o
r use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Ag
u
ilar
help: Do not
u
nnecessaril
y
look for a
r
e
positor
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David
Aguilar
submodule
.
c:
S
q
u
elc
h
a "use befor
e
assig
n
ment" warn
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id
A
guilar
diff
:
gene
r
a
t
e
pretty fi
l
enames i
n
prep
_
temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d
A
g
uilar
compat: add a basename() com
p
at
i
bility funct
i
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
compat: add a mkstem
p
s() compatibili
t
y
funct
i
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
Add git-rep
l
ace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--li
b
: add
s
upport for
a
raxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id Aguil
a
r
mergetool-
-
lib: specialize diff opt
i
ons fo
r
e
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id
Agu
i
lar
mergetool--lib: simplify API usage by rem
o
ving mor
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
uilar
difftool/mer
g
etool: refactor com
m
and
s
t
o use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool:
u
se $(
.
.
.
) inst
e
ad of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Aguilar
bas
h
completion: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
ila
r
diffto
o
l: add support
f
o
r a d
i
fftool
.
p
rompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
diff
t
oo
l
:
a
dd vario
u
s gi
t
-
difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Ag
u
il
a
r
diffto
o
l: m
o
v
e
'git-di
f
ftool' out of c
o
ntrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l: add
a -y
s
hor
t
cut
f
or --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
dif
f
tool
:
use perl built
-
ins
when
t
e
s
ti
n
g
for msy
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool: rem
o
ve the
back
u
p file
f
eature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Ag
u
ilar
dif
f
tool:
remove merge
o
p
t
ions for
o
p
e
n
d
i
ff,
t
kdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David A
g
uila
r
e
veryday: use
t
he
d
a
s
hless
f
orm o
f
git
-
init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David A
g
uilar
contrib/difftool: use a
s
e
parate config
n
amespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
a
v
id Aguilar
c
ontrib/difftool:
D
o
n
'
t repea
t
m
e
rge tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Aguilar
difftool: put the curso
r
on th
e
editabl
e
f
ile for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguila
r
difftool:
fix documentation
p
roblems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Aguilar
c
o
ntrib: add
'git diffto
o
l' f
o
r launch
i
n
g common m
e
rg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid Agu
i
lar
git-mer
g
etool: proper
l
y handle "git mergetool -
-
fi
l
e
n
am
e
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Da
v
id Ag
u
ilar
tests: add a test
c
ase for "gi
t
submodule sync
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Aguilar
git-sub
m
odule: ad
d
"
s
ync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguil
a
r
git-submod
u
le: r
e
pla
c
e duplicated code with
a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Ag
u
ilar
[PATCH] gitk:
D
on'
t
show local changes
w
hen we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree