repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool--lib: simplify command expressions
2013-01-29
Dav
i
d Aguila
r
mergetool
-
-l
i
b: simplify command expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
m
erget
o
ols: simplify how w
e
handle
"
v
im"
a
nd "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
la
r
mergetool--
l
ib: improve show_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
i
d
Aguilar
m
e
r
getools/vim: remove r
e
dundant di
f
f
c
ommand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
Da
v
i
d Aguilar
mergetool-
-
lib: Allow cu
s
tom co
m
mands to overrid
e
built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid
A
guilar
gi
t
k: Rename 'tagcontents' to 'cached_t
a
gco
n
tent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
i
tk
:
Te
a
ch "Reread references" to reload
t
ags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David A
g
uilar
merg
e
tool
,
difftool: Do
c
ument --tool-help
c
o
n
sistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
id Agu
i
lar
di
f
ftool: Disable -
-
symlinks on cy
g
win
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguil
a
r
difftool: Handle compare() re
t
urning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
g
u
ilar
difftool:
Wrap long lines for re
a
dabil
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David
Agui
l
ar
dif
f
tool: Check all
return
codes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d
Aguilar
difftool: H
a
ndle finding mergetools/ i
n
a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftoo
l
: Use symlinks when
d
i
ffing
a
g
a
inst the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difft
o
ol: Call
the
temp di
r
ectory "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
diff
t
ool: Move option values
into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difft
o
ol: Elimin
a
te globa
l
varia
b
les
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
iffto
o
l: Simplify
p
rint_t
o
ol_h
e
lp()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Davi
d
A
g
uilar
t7800: Test d
i
fftool
p
assing argumen
t
s
to d
i
ff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguil
a
r
me
r
getool: Provide an empty file when neede
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Ag
u
ilar
Make
f
ile
:
I
m
pr
o
ve compiler
h
eader dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
mergetools/meld: Use
'--output' whe
n
availa
b
l
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetoo
l
-
-
l
ib
:
Refacto
r
tools into
s
e
p
arate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Agu
i
lar
m
ergetool--lib: Make
style consiste
n
t with
g
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
d
ifftool--helper: Make
sty
l
e
c
onsist
e
nt
wit
h
g
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t750
3
-
pre-commit-hook
.
sh
:
A
dd GI
T
_PR
E
FIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid
A
gu
i
lar
git-merget
o
ol--l
i
b: Make vimdiff
retai
n
the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
git:
R
emove handling for
G
IT
_
PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id A
g
u
i
lar
set
u
p
:
Provi
d
e G
I
T_
P
REFIX
t
o
b
ui
l
t-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync: Update "submodu
l
e
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David
A
guilar
me
r
get
o
ol: Skip auto
r
esolved
pa
t
hs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Agui
l
ar
D
o
cumentation: Expl
a
in git-
m
ergetool's use of t
e
mp
o
rary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Agui
l
ar
Mak
e
fi
l
e: Rem
o
ve usage of depre
c
a
ted P
y
thon
"
ha
s
_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
Aguilar
dif
f
tool: F
i
x '--gui
'
when diff
.
gu
i
tool is
u
nconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difftool
.
sh: Tes
t
mergetool
.
prompt fa
l
l
b
ack
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Up
d
ate copyright not
i
ces to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
difftool:
U
s
e
eval
t
o exp
a
n
d '--extcmd'
expre
s
sions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
a
r
difftool:
A
d
d
'
-x' an
d
a
s
an al
i
as for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguila
r
t
7800-diff
t
o
ol
.
sh
:
Simplify
th
e
--extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-
d
iff
.
txt: Li
n
k to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
difftool
:
A
l
low sp
e
cifying unconf
i
gured c
o
mmand
s
w
it
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
difftool--
h
elp
e
r: Remove use of the GIT_M
E
RGE_TOO
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool-
-
hel
p
e
r
:
U
p
date copyright and rem
o
v
e
distra
c
t
i
n
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
lar
git-difftool: A
d
d '-
-
gui' for selecti
n
g a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
ar
t780
0
-difftool:
S
et a b
o
gus tool
f
or use
by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguila
r
he
l
p:
Do not unnecess
a
r
i
ly l
o
ok for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
s
u
bm
o
d
u
le
.
c
:
Squelch
a "use before assignment
"
warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vi
d
Aguilar
diff
:
generate
prett
y
filenames in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
compat: add
a
base
n
ame() compatibi
l
ity fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
com
p
at:
ad
d
a mkstemps()
compati
b
ilit
y
func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-repla
c
e
to
.
giti
g
nore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--
l
ib
:
add support
f
o
r a
r
axis merg
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguila
r
mergetool--lib: specialize diff op
t
ions fo
r
emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid A
g
uilar
m
e
rgetool--lib: simplify API usage by r
e
moving mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
A
guilar
d
i
fftool/merget
o
ol
:
refactor comman
d
s to use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
merg
e
tool: use $(
.
.
.
) in
s
tead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
bash com
p
letion: add git-dif
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool:
a
d
d
support for a difft
o
ol
.
prompt co
n
f
i
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
diffto
o
l:
add
various
git-diff
t
ool
tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
di
f
ftoo
l
: move 'git-difftool' out of con
t
rib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
Aguila
r
d
i
fftool
:
add a -y
sho
r
tcut fo
r
--no
-
prom
p
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
la
r
di
f
ftoo
l
: use p
e
rl
b
uilt-ins when
t
e
sting for
m
s
y
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l: remove t
h
e backup file
f
ea
t
ure
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
il
a
r
dif
f
tool:
r
emove merge options for
o
pendi
f
f, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David
A
g
uil
a
r
everyday: use th
e
da
s
hless form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
i
d Aguilar
co
n
trib
/
diffto
o
l: use a separate config namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
a
v
i
d Agu
i
lar
cont
r
ib/diff
t
ool: Don't
r
e
peat merge tool cand
i
dates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
id Aguilar
difftool:
put the cursor on the editab
l
e fil
e
for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
ilar
d
if
f
t
ool
:
fix docum
e
ntation p
r
oblems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
avid
Aguilar
c
o
ntrib:
a
dd 'git di
f
ftool' f
o
r launching co
m
m
on
m
er
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David A
g
uilar
git-mergetool
:
pro
p
er
l
y
hand
l
e "gi
t
mergetool
-
- filen
a
m
e"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Da
v
id
Aguilar
tests: add a testcase
f
o
r
"git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Ag
u
i
l
ar
git-
s
ub
m
odule: add "
s
ync"
comma
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
avid Ag
u
i
lar
git-submodul
e
: r
e
place dup
l
icated code with a m
o
d
u
le
_
list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Ag
u
ilar
[P
A
TCH] gitk: Don
'
t show loca
l
changes when we ther
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree