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
git-svn: use a lowercase "usage:" string
2013-02-24
David Aguilar
git-
s
vn: use
a
lowe
r
case "u
s
a
g
e:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-sh-s
e
tup: use a
lowercase "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4m
e
rge: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id
Aguilar
difftool--helper: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
il
a
r
doc: generate a
list
of valid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David
Ag
u
ilar
me
r
ge
t
ool--lib: add
f
unctions for
finding
available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d
Aguila
r
mergetool--lib: im
p
rove th
e
h
e
lp
t
ext in gu
e
ss_
m
erge_t
o
ol()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib: sim
p
lify command expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
mergetools: simplify h
o
w we handle "vim" a
n
d "def
a
ults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
erget
o
ol--lib: imp
r
ove sh
o
w_tool_help()
o
ut
p
ut
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mer
g
eto
o
ls/v
i
m:
r
e
m
ove
redu
n
da
n
t diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Aguilar
m
erge
t
oo
l
s/p4m
e
rge
:
Honor $T
M
PDIR for the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid
A
guilar
mer
g
etools/p4merge: Handle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Ag
u
ilar
mergetool--lib: A
l
low custom commands
to
override built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
Aguilar
gitk: Rename 'tagco
n
tents' to
'
c
ached_tagc
o
ntent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
A
guilar
gi
t
k: Teach
"
Rerea
d
referen
c
es
"
t
o reloa
d
tag
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergeto
o
l,difftool: Do
c
um
e
nt --tool-h
e
lp consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difft
o
ol: D
i
sable --symli
n
ks on
cyg
w
in
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
tool: Handle compare
(
)
returnin
g
-1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
i
l
a
r
di
f
f
tool: W
r
ap l
o
ng
lines for re
a
dabi
l
ity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avid
Aguilar
difftool: Check al
l
ret
u
rn codes fro
m
co
m
pa
r
e()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
di
f
ftool: Handle finding mergetools/ in a path wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
A
g
uilar
d
i
fftool: Use symlinks
w
hen diffin
g
ag
a
i
nst the
worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
d
i
fftool: Ca
l
l the tem
p
director
y
"git-dif
f
tool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
dif
f
tool:
Move op
t
ion values into a ha
s
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Agui
l
a
r
difftool: Eliminate global v
a
r
i
ables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
g
u
ilar
diffto
o
l:
Simplif
y
print_
t
ool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David
Aguilar
t
7800: Test difftool passing argume
n
ts
to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
Da
v
id Aguilar
mergetool: Provide an emp
t
y file when
nee
d
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Agui
l
ar
Ma
k
efile: Improve compile
r
header depen
d
ency ch
e
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid
A
g
u
ilar
mergetools/meld: Use '--output'
wh
e
n
available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
me
r
getool--lib:
Refactor tools i
n
to separate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
mergetool
-
-l
i
b: Make styl
e
consisten
t
w
ith
g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Agui
l
ar
difftool--helper: M
a
ke style consistent wi
t
h gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguila
r
t/t7503-pre-c
o
mmit-ho
o
k
.
sh: Add GIT_
P
REFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Agu
i
la
r
git-mergeto
o
l--lib
:
Make vimdiff retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
i
d Aguilar
git: Remove
h
andling
f
or GI
T
_
P
REFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uil
a
r
s
e
t
u
p
:
Prov
i
de GIT_PREFI
X
to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David
A
guilar
submodu
l
e s
y
nc: U
p
date "su
b
module
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
A
g
uila
r
me
r
getool: S
k
ip a
u
toresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Documentation: Expl
a
in gi
t
-merge
t
ool
'
s use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Ag
u
ilar
Makefil
e
:
Remove
usage of
deprecated
Py
t
hon "has
_
key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
Ag
u
ilar
difftool: Fix '--gui' when d
i
ff
.
guitool is u
n
configured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id Aguilar
t
7800-di
f
f
t
ool
.
s
h
: T
e
st merget
o
ol
.
prom
p
t fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avi
d
Aguilar
difftoo
l
: Update copyright no
t
ices to list each ye
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
di
f
ftool: Use eval to
expand
'--
e
xt
c
md' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
diff
t
ool: Add '-x'
a
n
d as a
n
alias for '--ext
c
md'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
t78
0
0-difftool
.
sh
:
Si
m
plify t
h
e --
e
xtcmd t
e
st
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
git-diff
.
txt: Link
t
o git-diffto
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Allow
s
p
ecif
y
i
ng unconfigured com
m
ands
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
difftool--hel
p
er: Remove u
s
e of the GIT_ME
R
GE
_
TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool
-
-helper: Update copyright and remo
v
e distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftoo
l
: Add '--gui'
f
o
r
sel
e
cting a
G
U
I tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t780
0
-difftool
:
Set
a
bogu
s
too
l
for use by test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
A
guilar
help: Do not unnecessar
i
l
y look for a
reposi
t
ory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submo
d
ule
.
c: Squel
c
h
a "use be
f
o
re as
s
ignmen
t
" warn
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: generate pret
t
y filenames in prep_temp_blob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
uilar
compat
:
a
d
d a
b
asenam
e
(
)
compatibili
t
y func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Agui
l
ar
compat:
add a mkstemps() compa
t
ibility
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
Add git-replace to
.
git
i
gnore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
Ag
u
ilar
me
r
getool--lib: add
s
upp
o
r
t f
o
r araxis m
e
rge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid A
g
uila
r
m
erge
t
o
o
l--lib: specialize
d
iff option
s
for
e
m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Agui
l
ar
mergetool--lib: s
i
m
p
lify API usage by removi
n
g more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
diffto
o
l/mergetool: r
e
factor commands to use gi
t
-me
r
getool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d Ag
u
il
a
r
m
e
rgetool:
use $(
.
.
.
) instea
d
of `
b
ackti
c
ks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
ilar
bash
co
m
pletion:
add
g
it-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l
: add
s
upport
f
or a
d
iffto
o
l
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
d
iff
t
o
o
l:
a
d
d vario
u
s gi
t
-di
f
ftool
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
:
move 'git-difftool' out
of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: a
d
d a -y shortcut for --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: use perl
b
uilt-ins when testing for msy
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
dif
f
t
ool: remo
v
e the backu
p
file
f
eature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
lar
difftool:
r
e
m
ove merge o
p
tions for o
p
endiff
,
tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Ag
u
ila
r
everyday: use t
h
e dashless
fo
r
m of
g
i
t
-
init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguila
r
co
n
trib/difftool: use
a
sepa
r
ate config
n
a
mespace fo
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Da
v
id Aguilar
con
t
rib/
d
i
fftool: Don't repeat merge t
o
ol candida
t
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Aguilar
d
i
ffto
o
l: put
t
he cursor on t
h
e editable fil
e
f
o
r
Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid A
g
ui
l
ar
difftool: fix docu
m
entation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
i
d
A
g
uilar
contrib: add 'git d
i
f
ftool
'
f
or l
a
u
n
ching common mer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid A
g
u
ilar
gi
t
-mer
g
etool:
p
roperly handle "git m
e
rgetool --
f
il
e
na
m
e"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Agu
i
l
ar
tests: add a test
c
ase for "git submodule
s
y
nc"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Agui
l
ar
git-submodule: add "sync"
c
ommand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Ag
u
il
a
r
git-submodule: replace duplicat
e
d
code wi
t
h
a
m
odule_lis
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[
P
ATCH] gitk
:
Don'
t
show
l
ocal
c
h
a
nges when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree