repo.or.cz
/
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: improve show_tool_help() output
2013-01-28
David
A
guilar
merge
t
ool--
l
ib: improve show_to
o
l_h
e
lp() o
u
t
put
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d
Ag
u
i
l
a
r
mergetools/vi
m
: re
m
ove re
d
undant diff
c
omm
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
D
avi
d
Aguil
a
r
mergetool--l
i
b: Allow custom
commands to override built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
gitk: Rename 'tagcon
t
ents' to 'cached_tag
c
ontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gi
t
k: Teac
h
"Reread re
f
erence
s
" t
o
r
e
load tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
Davi
d
A
g
uila
r
mergetool
,
difftool: Docum
e
nt
-
-tool-help
co
n
sistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
la
r
difftool
:
Disa
b
le -
-
sym
l
inks
on cyg
w
in
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
difftool: Handle co
m
pare()
r
e
t
urning -
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
avi
d
Aguilar
difftool: Wrap lo
n
g l
i
nes for re
a
dab
i
lity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
ilar
difftool: Check all return
c
odes from
compar
e
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Ag
u
i
l
ar
di
f
ftoo
l
: Handle 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
: U
s
e
s
ymlinks when diffing
a
ga
i
nst t
h
e
w
orktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
u
i
lar
difftool: Cal
l
the
t
e
m
p direc
t
ory "git-difft
o
ol"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Agu
i
lar
difft
o
ol: Move
opt
i
o
n
values into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool:
E
liminate global
v
a
riable
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
dif
f
tool:
S
i
mplify print_
t
ool_he
l
p
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Test difftool
p
assing a
r
gume
n
t
s
to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
Davi
d
Aguilar
mergetool: Provide an
empty file when
needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
a
vid Agu
i
lar
Make
f
i
l
e: Improve compiler
header dependenc
y
c
h
eck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Agu
i
lar
mergeto
o
ls
/
m
e
l
d: Use '--output' when avai
l
a
ble
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
rgetool--lib: Refact
o
r t
o
ols into separate
f
iles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
g
u
i
lar
merget
o
o
l
--lib: Make style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
difftool--
h
e
l
p
e
r: Make style cons
i
s
t
ent with
g
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d Aguila
r
t/t7
5
03-pre-commit-h
o
ok
.
sh: Add GIT_
P
R
EFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guila
r
git-mergetool--lib: Make vi
m
d
iff reta
i
n the cur
r
ent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Agui
l
ar
git: R
e
move ha
n
d
l
in
g
for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
set
u
p: Provide
G
I
T
_PREFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
Aguilar
subm
o
d
u
le s
y
nc: Update
"su
b
module
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d
Aguilar
merget
o
ol
:
Skip autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David
Aguil
a
r
Docume
n
t
a
tion: Explain
g
it-m
e
r
getoo
l
's
u
se
of
t
emporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David
Ag
u
ila
r
M
akefile: Remove usa
g
e of deprecated Pyt
h
o
n
"
has_ke
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
Aguilar
difftool:
Fix '--g
u
i' whe
n
diff
.
guitool
i
s unconfigure
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Davi
d
A
g
u
ilar
t7
8
00-difftool
.
sh: Te
s
t mergeto
o
l
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid
A
guilar
difftool: Up
d
at
e
copyrig
h
t no
t
ices t
o
list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
i
lar
difftool: Use eva
l
to e
x
pan
d
'
--extcmd' exp
r
ess
i
on
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
diff
t
o
o
l: A
d
d
'
-x'
a
nd as
an alias for
'
-
-e
x
tcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
g
uilar
t78
0
0-di
f
ftoo
l
.
sh: Simplify the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguil
a
r
git
-
diff
.
txt: Lin
k
to
git-difft
o
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid A
g
uilar
diffto
o
l:
A
llow sp
e
cifyin
g
un
c
onfigured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
a
r
difftool--helper:
Remove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
difftool--hel
p
er: Update
c
opyri
g
ht and
remove di
s
tracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
gui
l
a
r
git-d
i
f
f
tool: Add '-
-
gui' fo
r
se
l
ecting a G
U
I t
o
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
t7800-difftool
:
Se
t
a bogus tool for use
by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Ag
u
i
l
ar
help: Do not unnecessarily
look for a r
e
pository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid A
g
uilar
submodule
.
c
:
Squelch
a
"use
b
efo
r
e assignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
diff
:
generate
p
r
etty fi
l
enames in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
com
p
at: add a basenam
e
(
)
compatibili
t
y func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
compat:
a
dd a mk
s
temps() compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
Add gi
t
-replace to
.
gi
t
i
gnore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d A
g
uilar
m
e
rgetool--lib: add supp
o
rt for araxi
s
merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
avid Aguila
r
mer
g
etoo
l
--lib:
s
pecialize diff opt
i
ons f
o
r eme
r
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mer
g
et
o
ol--lib:
simplify AP
I
u
s
age b
y
removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id
Aguilar
dif
f
t
oo
l
/mergetool: refac
t
or com
m
ands t
o
use
g
it-mergetoo
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid A
g
uilar
mergetoo
l
: use $(
.
.
.
) in
s
tead
of
`
ba
c
kt
i
cks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
b
a
s
h comple
t
ion: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftoo
l
: add support f
o
r a difftool
.
prompt
conf
i
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difft
o
ol: add v
a
ri
o
u
s
g
i
t
-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: move
'
git-
d
iff
t
o
ol'
o
ut
of
c
o
n
tr
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
A
g
u
i
lar
difftool: add
a -y
shor
t
cut
f
or --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftoo
l
: use perl built-i
n
s whe
n
t
e
sting
for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
d
ifftoo
l
: remove th
e
ba
c
kup fil
e
feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
diff
t
ool: remove merge
optio
n
s for o
p
e
n
diff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Ag
u
ilar
e
very
d
a
y
: use t
h
e dashless form of git
-
init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d
Aguilar
contrib/difftool: use
a
separate
c
o
nfig
namespac
e
f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
avid Aguilar
contrib
/
dif
f
too
l
: Don't repea
t
mer
g
e
tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
di
f
ftool: pu
t
the
c
ursor on the editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
i
l
ar
difftool: fix documentatio
n
problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Dav
i
d Aguilar
c
ont
r
ib: add 'g
i
t
difft
o
ol' f
o
r launching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguila
r
git-mergetool: proper
l
y h
a
ndle "git
m
ergetool --
fil
e
n
a
me"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David
A
g
uilar
tests
:
add a
testcase for
"
git submodule
sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Davi
d
A
gui
l
ar
git
-
sub
m
od
u
le:
a
dd "sync"
c
o
m
mand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David
A
guilar
git-submo
d
ule:
replace dupl
i
cated code w
i
th a module_
l
ist
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguil
a
r
[PATC
H
] gitk:
D
on't s
h
ow local
c
ha
n
g
es
w
hen we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree