repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
contrib/credential: use a lowercase "usage:" string
2013-02-24
David Aguilar
cont
r
ib/
c
r
e
d
entia
l
:
u
se a l
o
wer
c
ase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
ilar
git-cvsimport: use
a lowercase "usage
:
" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-cvsimport: use a
l
o
w
e
rcase "
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-cv
s
expo
r
tcomm
i
t: use
a lower
c
a
s
e
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-archimpo
r
t: use
a lowercase "usage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agui
l
ar
git-merge-one
-
file: use a lowe
r
cas
e
"us
a
ge:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-reli
n
k
:
use a lo
w
ercase "usage:" s
t
ri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-svn: use a lo
w
ercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-setup: use a
l
o
wercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Agu
i
lar
d
ifftool--helper:
f
ix printf usa
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Agu
i
lar
doc: generat
e
a
list of v
a
lid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
me
r
getool-
-
lib: add funct
i
ons
f
o
r finding av
a
ilable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
mergetool--lib: improve the help text in gu
e
ss_me
r
ge
_
t
ool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
mergeto
o
l
--
l
ib: si
m
plify command ex
p
res
s
ions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguilar
mergetools:
s
impli
f
y how we handle
"v
i
m" and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguil
a
r
m
e
rg
e
to
o
l--li
b
: i
m
prove show_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
lar
m
ergetools/vim: remove redundant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
Da
v
id A
g
u
i
lar
mergetools/
p
4merge: Hono
r
$TM
P
DIR for the /dev
/
null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
me
r
getools/p4merg
e
:
Ha
n
dle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
Davi
d
Aguilar
merg
e
tool--li
b
: Allow
c
ustom co
m
mands
t
o
o
verride bu
i
lt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Agui
l
ar
gitk: Rename 't
a
g
contents' to 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
gi
t
k:
T
each "Reread references" to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
merg
e
tool,difftool: Document --t
o
o
l
-
help
cons
i
st
e
ntly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
dif
f
t
ool: Disab
l
e --symlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
ifftool: Handle compa
r
e() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguilar
difftoo
l
:
Wrap long l
i
nes for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
a
v
i
d
Aguila
r
difftool
:
Che
c
k
all return
c
o
d
e
s
from
c
ompare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d
Aguilar
diff
t
ool
:
Hand
l
e
f
inding me
r
getools/ i
n
a path wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguil
a
r
diffto
o
l: Use symlinks whe
n
diffing
a
g
a
in
s
t the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
dif
f
tool: Ca
l
l the temp directo
r
y "g
i
t-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
d
ifftool:
M
o
ve
option v
a
lu
e
s
i
n
t
o a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avi
d
Aguil
a
r
difftool: Eliminate global variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d Aguilar
difftool: Simplify print_to
o
l
_
help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David
Agu
i
lar
t7800: Test
d
ifftool passing arg
u
me
n
ts
t
o di
f
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
A
guilar
m
ergetool:
P
r
o
vide an
e
mpty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Ag
u
ilar
Makefile: Improve compiler header
depend
e
ncy
check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
m
erge
t
o
ols/meld: Use
'
--output' when ava
i
l
a
b
le
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--
l
ib:
Re
f
actor
t
o
o
ls i
n
to separate file
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
mergetool--lib: M
a
ke style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid
A
guilar
d
i
f
fto
o
l--helper: Mak
e
s
tyl
e
consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d
Agu
i
lar
t/t7503-pre-com
m
it-hook
.
sh: Add GIT_PREF
I
X
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Ag
u
ilar
gi
t
-mergetool--lib: Make vi
m
diff
r
etain t
h
e current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git:
R
emo
v
e han
d
ling for GIT_PREFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
setup: Provide GI
T
_PRE
F
IX to built-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David
Agui
l
ar
su
b
m
o
dule sync: Upd
a
te "sub
m
odule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
av
i
d
A
guilar
mer
g
et
o
ol: Skip
a
u
t
oreso
l
ved
p
aths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Docume
n
tation: Explain git-mergetool's use of tempora
r
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Aguilar
M
a
k
ef
i
le:
R
emove
usage of deprec
a
ted Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Agui
l
ar
difftool
:
F
i
x '--gui' when diff
.
guito
o
l
is unco
n
figured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-di
f
ftool
.
sh: Test
mergetool
.
p
rompt fallba
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
i
fftoo
l
: Update
c
opyr
i
ght notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
difftool: Use e
v
al to e
x
pand
'--extcmd'
e
x
p
ressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
d
iff
t
o
o
l: Add '-x' and as an ali
a
s for '--extcm
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t780
0
-diff
t
ool
.
sh:
Sim
p
lify the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
git
-
diff
.
txt:
L
ink to
g
it-dif
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Al
l
ow spe
c
i
f
y
ing unconfigur
e
d
command
s
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
difftool--help
e
r: Remov
e
use of the
G
IT_MER
G
E_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diffto
o
l-
-
helper: Update copyright
a
nd remov
e
d
i
s
tr
a
cting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool:
A
dd '--gui' fo
r
s
electing a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
t7800-difftool:
Set a bogus
t
o
ol
fo
r
u
se by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid A
g
uilar
help: Do not un
n
ecessarily look fo
r
a repos
i
tory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid Ag
u
ilar
submodule
.
c: Squelch
a
"
u
se before assignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guil
a
r
d
iff
:
genera
t
e pretty
f
ilenames
i
n
p
r
e
p_temp_b
l
ob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
compat: add a basename
(
) compat
i
bility
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Agui
l
ar
compat: add a mks
t
em
p
s() compatib
i
lity f
u
ncti
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguil
a
r
Add gi
t
-replace t
o
.
gitign
o
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
A
guilar
mergetool--lib
:
a
d
d sup
p
ort for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
mergetoo
l
--lib: spe
c
ia
l
ize diff op
t
ions for emerg
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
avid
A
g
u
ilar
mergetool--lib: simplify AP
I
usage by r
e
moving mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool/mergetoo
l
:
r
efactor com
m
ands to use git-mergetoo
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
mergeto
o
l: use $(
.
.
.
) instead of `bac
k
ticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bas
h
completion:
add git-
d
ifftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
uil
a
r
d
ifftool:
add
supp
o
rt
for a difftool
.
p
rompt
co
n
fig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difft
o
o
l
: add v
a
rious git-difft
o
ol t
e
st
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
i
f
ftool: m
o
v
e
'g
i
t-diffto
o
l
' out of con
t
rib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguilar
difftoo
l
: add a -y shortc
u
t
for --
n
o-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Ag
u
ilar
difftoo
l
: use per
l
built-ins
whe
n
testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
dif
f
too
l
: remov
e
the backup file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool:
r
e
move merge options for opendif
f
, tk
d
iff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
eve
r
yday: use t
h
e dashless
f
o
rm of
git-in
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Aguilar
co
n
trib/dif
f
tool: use a
s
epa
r
ate c
o
nfig namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
cont
r
ib/
d
ifftool: Don't repeat merge tool
ca
n
didates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
i
d
A
guil
a
r
diffto
o
l:
p
u
t the cursor on
the editable f
i
le fo
r
Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Aguilar
di
f
f
t
ool:
fix do
c
umentat
i
on pro
b
l
e
ms
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid
A
g
u
i
lar
contrib: add 'git difftool' f
o
r launc
h
ing com
m
on mer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David A
g
uil
a
r
git-merg
e
tool: pr
o
perly handle
"
g
i
t
mergetool -- filename
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
t
ests:
add a t
e
s
t
case for
"g
i
t submo
d
ule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id
A
guilar
git-submodule
:
add
"sync"
c
o
mmand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David
Aguilar
git-
s
ubmodul
e
: replace du
p
l
icated cod
e
with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
avi
d
Aguilar
[PAT
C
H]
gitk
:
Don't s
h
o
w
local chang
e
s when we
there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree