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
t7800-difftool.sh: Test mergetool.prompt fallback
2010-01-23
David A
g
uilar
t
7800-difftool
.
sh: Test mergetool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Update copyright no
t
ices
to li
s
t
e
a
c
h year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Use ev
a
l to expand '--extcm
d
'
expr
e
ssions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguila
r
difftool: Add
'-x' and
a
s an alias for
'
--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7
8
0
0
-difftool
.
sh: Simplify the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
git-diff
.
txt: Link to
g
it-difftoo
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
diffto
o
l: Allow specifying unconfigured commands w
i
th
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
l
ar
d
i
f
ftoo
l
--he
l
p
er: Remove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid A
g
uilar
di
f
f
t
ool-
-
hel
p
e
r: Update copyright and remove di
s
tracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
gi
t
-d
i
fftool:
A
dd '--g
u
i' f
o
r selecting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguilar
t78
0
0-difftool
:
Set a
bog
u
s tool for use by
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
avid Agui
l
ar
help: Do not unnec
e
ssar
i
ly
l
ook
f
or a repo
s
itory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Aguilar
s
u
bmodu
l
e
.
c: Squelch a
"
use
b
efore as
s
ignm
e
n
t" war
n
in
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
dif
f
:
gen
e
r
a
t
e pretty filename
s
in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid A
g
ui
l
ar
compat: add a basename() compatibi
l
ity fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
u
ilar
c
o
mpa
t
: add a mkste
m
ps() compa
t
ibility
f
u
n
ction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
Add
git
-
replace
t
o
.
gitignor
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
A
guilar
mergetool--lib: add sup
p
ort for ara
x
is merg
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Agu
i
lar
mergetool--lib: specialize dif
f
o
p
tions fo
r
emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
Aguilar
merget
o
o
l
--lib: simplify
A
PI usage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool/merg
e
too
l
:
refactor comm
a
nds to
use git-merg
e
tool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
mergetool: us
e
$(
.
.
.
)
i
nstead of `b
a
c
kticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
ba
s
h completi
o
n
: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: a
d
d support for
a
difft
o
ol
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool: add various git-difftool test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
dif
f
tool: move 'gi
t
-
d
if
f
tool' out of
c
on
t
r
ib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool:
add a -y shortcu
t
for --n
o
-
p
rompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
il
a
r
difftoo
l
: use pe
r
l built-ins when
te
s
tin
g
f
or msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
uilar
difftool:
r
e
m
ove
t
he backup file f
e
ature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
remove merge op
t
i
ons for
opendiff,
t
kdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday:
u
s
e the da
s
hless form of git-i
n
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
v
id A
g
uilar
c
on
t
rib/difftool
:
u
s
e a separate co
n
f
i
g
namespace f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
c
o
n
trib/diff
t
ool:
D
on't repeat merge
too
l
candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguilar
d
ifftool
:
put the curs
o
r
o
n the edita
b
l
e
fil
e
f
o
r
Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Aguilar
difftool:
f
ix docum
e
n
ta
t
ion problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguil
a
r
contrib: a
d
d '
g
it difftool' for l
a
unching common
m
erge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid Aguilar
git-merg
e
t
ool: properly
h
andle
"git merge
t
ool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests:
add a testcase
f
or "git subm
o
dule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guila
r
g
i
t-submodule
:
a
d
d "s
y
nc" comm
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
avid
A
g
u
ilar
git-submod
u
le
:
repl
a
ce d
u
pli
c
ated
c
ode with a module_l
i
st
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David
Aguilar
[PA
T
CH]
g
i
tk
:
D
on
'
t
show local changes when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree