repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7800: update copyright notice
2013-02-20
David
A
guilar
t78
0
0:
u
pdat
e
c
opyright no
t
ice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
Davi
d
Aguilar
difftool
:
s
i
lenc
e
u
ni
n
itialized variable warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
A
guilar
p4m
e
rge
:
fix pr
i
ntf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguil
a
r
difftool--hel
p
e
r
:
f
i
x
printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Agui
l
ar
doc: gen
e
rate a
l
i
s
t of valid merge t
o
ols
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
av
i
d Agu
i
lar
mergetoo
l
--
l
ib: add functions for finding ava
i
labl
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
i
d Agu
i
lar
mergetool--lib:
improve the help
t
ext
in gue
s
s_merge_
t
ool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib
:
si
m
p
l
ify command expressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Ag
u
ilar
m
e
rgetools: simplify how
w
e handle "vim"
a
nd "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Agu
i
la
r
mergetool--
l
ib: i
m
prove
show_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguil
a
r
mergetools/vim
:
remove redunda
n
t diff c
o
mmand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
avid Aguilar
m
ergetools/p4merge: Ho
n
or $TMPD
I
R for the /de
v
/n
u
ll
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mer
g
etools/p4merge:
H
andle
"
/
d
ev/null
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
D
a
vid Aguilar
me
r
get
o
ol-
-
lib: Allow custom commands to override built-i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rena
m
e '
t
agco
n
tents' to 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
gitk: T
e
ac
h
"Reread
references" t
o
rel
o
ad tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David A
g
u
ilar
mergetool,diffto
o
l
:
Document --tool-help consist
e
n
t
ly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguila
r
difftool:
D
isable --s
y
mli
n
ks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
u
i
lar
diff
t
ool: Handle
compare
(
) returnin
g
-1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d
Agu
i
l
a
r
d
i
ff
t
o
ol: Wrap l
o
ng l
i
nes for readabil
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid
Ag
u
i
l
ar
difftool: Check all return codes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
di
f
f
t
ool: Handle finding me
r
ge
t
ools
/
i
n
a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use symlinks when diffing against
the work
t
re
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
diff
t
ool: C
a
ll the
t
em
p
dir
e
ctor
y
"gi
t
-di
f
f
too
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
di
f
ft
o
ol: Mo
v
e
op
t
ion val
u
es into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
f
too
l
: Eliminate global variabl
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
difftool: Sim
p
lif
y
p
rint_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Agu
i
la
r
t7800:
T
est difftool passing arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
Davi
d
Aguil
a
r
m
ergetoo
l
: Provid
e
an e
m
p
ty
file wh
e
n need
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
a
vid Aguilar
Ma
k
e
f
ile: Improve compil
e
r
header dependency
c
h
eck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ila
r
mergeto
o
ls/meld:
Use
'
-
-outpu
t
'
when a
v
ail
a
b
le
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
mergetool--lib: Refactor tools into
s
eparate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
mergetool
-
-lib: Make s
t
yl
e
consis
t
ent
w
ith git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
il
a
r
d
ifftoo
l
--help
e
r:
M
ake st
y
le consist
e
nt with gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguila
r
t/t7503-pre-commit-hook
.
sh: Add
GIT_PREFIX test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Agui
l
ar
git-mergetool--li
b
: Make
vimdiff ret
a
i
n
t
he cu
r
rent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguilar
git: Remove handling for GIT_P
R
EFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
i
d Aguilar
s
e
tup:
P
ro
v
i
de GIT_PREFI
X
t
o bu
i
lt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Agu
i
l
a
r
sub
m
odule s
y
nc: Update "submo
d
ule
.
<name>
.
u
r
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d A
g
uilar
mer
g
etool: Skip au
t
oresolve
d
paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Doc
u
menta
t
i
on: Explain
git
-
mergetool's use o
f
t
empo
r
ary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Agu
i
lar
Makefile: Remove
usage of deprecate
d
Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguil
a
r
diffto
o
l: Fix '--gui' whe
n
dif
f
.
guitool
is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid Aguilar
t7800-di
f
ftool
.
s
h
: T
e
s
t mer
g
e
tool
.
p
r
o
mpt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
dif
f
tool: Upd
a
te
cop
y
r
i
ght notices to li
s
t each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
il
a
r
d
if
f
t
ool: Use ev
a
l to
e
xpand '--
e
xtcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
fftoo
l
:
Add '-
x
' and as an
a
lias for '--
e
xtcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
t7800-difftool
.
sh: Simplify the --extcmd te
s
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
t
x
t: Link
to g
i
t
-
difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
l
ar
difftoo
l
:
A
llow specifyi
n
g unconfigur
e
d commands wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguil
a
r
di
f
ftool
-
-h
e
lper: Remove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Ag
u
ilar
diff
t
o
o
l--helper: Update copyright an
d
remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Aguilar
git-difftool:
A
dd '--gui' f
o
r
sel
e
cti
n
g a
GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-difftool: Set a bogus tool for us
e
by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id Aguilar
he
l
p: Do not unn
e
ce
s
sarily look for a repos
i
tor
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
s
ubmodule
.
c: Squelch
a
"use before ass
i
g
nment"
w
arning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
d
i
ff: generate
pretty filename
s
in
p
rep_temp
_
blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
a
r
co
m
pat:
a
dd a
basename() com
p
atibility f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a
mk
s
temps() compa
t
i
b
i
lity function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
A
d
d gi
t
-replace t
o
.
g
i
t
i
g
n
ore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--lib: add support for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
mer
g
etool--lib: specialize diff options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguila
r
merge
t
o
ol--l
i
b: simplify AP
I
usage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
diff
t
o
o
l
/merg
e
t
ool
:
refa
c
tor command
s
to us
e
git-merge
t
ool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
merget
o
ol: use $
(
.
.
.
) instead of `ba
c
kticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguila
r
bash completi
o
n: add git-difft
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
guilar
difft
o
ol: add support for a dif
f
tool
.
pr
o
mpt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l: add
v
a
rious git-d
i
fftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Aguilar
di
f
ftool: move 'git-difftool
'
out of contr
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add a -y shortcut
for --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool
:
use p
e
rl bui
l
t-in
s
whe
n
testing fo
r
msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uil
a
r
difftool: remov
e
the backu
p
file
f
e
a
tur
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool:
r
emove merge options for ope
n
di
f
f
, t
k
d
i
ff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d Aguilar
everyday:
u
se
the
d
ashles
s
f
o
rm of gi
t
-i
n
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/difft
o
o
l
: us
e
a
separate config namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
a
vid
A
guilar
c
o
ntrib/
d
ifftool: Don't repeat merge t
o
ol candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Aguilar
di
f
ftool: put the
c
ursor
o
n the e
d
itable
f
i
le for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
A
guilar
diff
t
ool:
f
ix documenta
t
ion probl
e
ms
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
avid Aguil
a
r
c
o
n
trib: add 'git d
i
fftoo
l
'
f
or launching co
m
mon merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Ag
u
ilar
g
i
t-mergetool
:
p
roperly handle "gi
t
mergetool -- f
i
lename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d Agu
i
lar
t
e
s
ts: add a testca
s
e for
"g
i
t submodule syn
c
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
i
d Aguilar
git-
s
ubmod
u
le: a
d
d "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid
Aguilar
gi
t
-submodule: repla
c
e
duplicated co
d
e with
a module_
l
i
s
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Da
v
id Aguilar
[PATCH]
g
itk: Don
'
t
show
l
ocal ch
a
n
ges w
h
en w
e
t
h
e
re
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree