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
mergetools: simplify how we handle "vim" and "defaults"
2013-01-29
David
A
guilar
m
e
rgetool
s
: simplify how
we
handle "v
i
m" and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
erge
t
ool--lib: i
m
prove show_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Ag
u
i
l
ar
m
e
rgetools/vim
:
re
m
ove redundant diff com
m
and
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David
Aguil
a
r
me
r
geto
o
l
-
-lib: Al
l
ow c
u
stom com
m
ands to override bu
i
l
t
-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
uilar
g
it
k
: Rename 'tagconten
t
s' to 'cached_tagc
o
ntent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
uilar
gitk:
Teach "Reread r
e
ferences" to rel
o
ad t
a
gs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
a
vi
d
Aguilar
m
e
rg
e
tool,dif
f
tool:
Docum
e
n
t
--too
l
-
h
el
p
consist
e
ntly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
d
ifftoo
l
: Disable --symlinks o
n
cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
diff
t
ool: Handle
compare() returning
-
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
di
f
ftool: Wrap long lines for r
e
a
da
b
ility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d A
g
uilar
dif
f
to
o
l: Ch
e
c
k
all ret
u
r
n
codes from
c
o
m
p
are
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Aguilar
difftoo
l
: Hand
l
e finding mergetools/ i
n
a path wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difftool: U
s
e symlinks when d
i
f
f
ing against the wo
r
ktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
g
u
il
a
r
d
ifft
o
ol:
C
a
ll the
t
emp directory "git-difft
o
ol"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
di
f
ftool: Move opti
o
n va
l
ue
s
i
nto
a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
d
i
fftoo
l
:
E
l
im
i
nate
gl
o
bal variabl
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
i
l
a
r
di
f
ftool: S
i
mplify print_tool_help(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d Aguila
r
t78
0
0: Test
d
i
f
ftoo
l
pa
s
sing arguments
t
o
d
if
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
Da
v
id
Ag
u
ilar
mergetool: Provide a
n
empty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguil
a
r
Makefile: Improve comp
i
ler header
dependency chec
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
mergetoo
l
s/meld: Use '--out
p
ut' when
availab
l
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
rgetoo
l
--lib: Refactor
t
ools into sepa
r
at
e
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
mergeto
o
l--lib: Make
s
tyle cons
i
stent wit
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
dif
f
tool--helper:
Mak
e
style cons
i
stent with gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7
5
0
3
-pre-commit-hook
.
sh:
A
dd G
I
T_PREF
I
X
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetool--
l
ib: M
a
ke
vimdiff retain th
e
cu
r
r
e
nt
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid
A
gu
i
l
a
r
git: Rem
o
ve
ha
n
dling for GIT_P
R
E
F
IX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
s
etup: Pro
v
ide GIT_PREFI
X
to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid Aguilar
su
b
mod
u
le sync:
U
pd
a
te "submodule
.
<n
a
me>
.
url
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid Aguilar
mergeto
o
l: Skip aut
o
resolved pat
h
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Agui
l
ar
D
ocumentation: Explain g
i
t-mer
g
etool's use of tempora
r
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Ag
u
ilar
M
akefile: Remove usage o
f
de
p
r
ecated
P
ython
"
has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguila
r
difft
o
ol: F
i
x '
-
-gui' whe
n
d
i
ff
.
g
u
itool is unc
o
nfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d
A
guilar
t7800-difftool
.
sh:
Test mergetool
.
prom
p
t fall
b
ack
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguil
a
r
difftool
:
U
pdate copyright notice
s
t
o
list
e
ach year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
difftool
:
Use eval to expand '--ex
t
cm
d
' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
u
ilar
difftool: 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
t7800-di
f
ftool
.
sh: Sim
p
lify
t
he
-
-e
x
tcmd 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
difftool: Allow specifyi
n
g unconfigured com
m
ands wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftoo
l
--helper: Remove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid A
g
u
i
lar
difftool--helper
:
U
p
date copyri
g
ht
and remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguilar
git-difftool:
A
d
d
'--gu
i
' for select
i
ng a
G
U
I tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Ag
u
ilar
t7800-difftool: Set a bogus to
o
l for u
s
e by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Agui
l
ar
help:
D
o not unnecessar
i
ly look for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David
Aguilar
submodule
.
c: Squelch a "use b
e
fore a
s
signmen
t
" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
diff: gen
e
rate prett
y
f
ilenames in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Agu
i
lar
c
ompat
:
add a basena
m
e() compati
b
i
lit
y
f
unction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id A
g
uilar
compat
:
add a mkstemps() compati
b
ilit
y
f
uncti
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-re
p
lac
e
to
.
gitignor
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--lib: add supp
o
rt for araxis m
e
rge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
me
r
getool--lib: s
p
eciali
z
e diff options
f
o
r emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
avi
d
Ag
u
i
l
ar
m
ergetool--lib: simpli
f
y A
P
I usage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
l
a
r
diffto
o
l/mergetool: refac
t
or commands to
use
git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguil
a
r
m
e
r
getool: use $(
.
.
.
) in
s
tead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
ba
s
h completion: add git-dif
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguil
a
r
dif
f
t
ool: add
support
f
o
r
a difft
o
ol
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: ad
d
v
ario
u
s git-
d
if
f
t
ool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move 'g
i
t-di
f
ftoo
l
' out
o
f contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agu
i
lar
difftool: add
a
-y short
c
ut fo
r
--no-promp
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool: use per
l
bui
l
t-ins
when t
e
sting
f
or msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove
t
h
e backup file
f
e
a
ture
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
diff
t
ool
:
remo
v
e merge option
s
for opendiff, tk
d
if
f
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agu
i
l
ar
everyday:
u
se the
d
a
s
hless form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/difftoo
l
: us
e
a
separate config namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
c
o
ntrib/d
i
ffto
o
l:
Don'
t
r
e
peat merge
to
o
l
c
andidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Ag
u
i
l
a
r
d
i
fftool:
p
u
t the cursor
o
n the editable
f
ile for
V
i
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguilar
dif
f
tool: fi
x
documentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
co
n
t
r
ib: add 'git difftool
'
for
launching common
me
r
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: properly hand
l
e
"git mergetool
-- filename
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
a
vid Aguilar
tes
t
s: add a testcase
for
"git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
avid
A
guilar
gi
t
-su
b
module:
a
dd
"
sy
n
c" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule:
rep
l
ace
d
uplicated
c
ode with
a
module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Dav
i
d Ag
u
ilar
[PATCH] gitk: Don't show
l
o
c
a
l cha
n
g
e
s
whe
n
we
there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree