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
contrib/examples: use a lowercase "usage:" string
2013-02-24
David Aguilar
con
t
r
ib
/
examples: us
e
a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
ib/fast
-
import
/
im
p
o
rt-zips
.
py: use spac
e
s
i
nstead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contrib/fast-import/import-
z
ips
.
py: fi
x
bro
k
en error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
cont
r
ib/fas
t
-import: use a low
e
rc
a
se "usage:"
s
t
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/credentia
l
:
use a l
o
wercase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
gi
t
-cvsimp
o
rt
:
use a
l
ower
c
ase "usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
guilar
git-cvsimport: use
a lo
w
ercase "usage:" st
r
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agu
i
l
a
r
git-cvsexportcommit: use a lo
w
ercase "
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archimport: use a lowerca
s
e "u
s
age:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-merge-one-f
i
le:
use a lowerca
s
e "
u
sage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ilar
g
it-r
e
link
:
use
a
lowercase
"
us
a
ge
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-svn:
u
se a lowe
r
case "usag
e
:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
gi
t
-sh-setup: use a lowerc
a
se "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Agu
i
lar
p4merge: fix p
r
int
f
usa
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool--helper: fix pri
n
tf
usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: generate a list of valid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Aguilar
merget
o
ol--lib: add functio
n
s
for fi
n
ding a
v
ailable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
mergetool--l
i
b: impr
o
ve the help text in guess_mer
g
e_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
merg
e
tool--lib: simpli
f
y command
e
xpressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uila
r
merge
t
ool
s
: simplify how we
handle "vim" and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
Ag
u
ilar
mergetool--lib
:
im
p
rove sh
o
w_t
o
ol_help
(
) output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
A
g
u
i
l
ar
m
er
g
etools/
v
im: remove redunda
n
t d
i
ff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
me
r
g
eto
o
ls/p4merge: Hon
o
r $
T
MPDIR for the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Dav
i
d Aguila
r
m
e
rgetools/p4me
r
ge
:
H
andl
e
"
/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--lib: Allow custom commands to override built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk: Rename 'tagc
o
n
t
ents
'
to 'cached_tagc
o
nt
e
nt'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach "
R
er
e
a
d
references"
to reload t
a
gs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,difftool: Document
-
-tool-h
e
lp consis
t
ently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
diff
t
oo
l
:
Disable
--
s
y
m
lin
k
s
on cygwi
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
u
ilar
d
iff
t
ool: H
a
ndle c
o
mpare() returning
-1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
difftool: W
r
ap long lines for r
e
a
dability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
av
i
d Aguilar
diffto
o
l:
C
hec
k
al
l
return
codes fro
m
compa
r
e()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d A
g
uilar
diffto
o
l:
H
an
d
le finding mergetools/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difft
o
ol
:
Use symlinks
when di
f
fing
against the worktre
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
i
lar
difftool: Call the temp
d
i
rectory "gi
t
-di
f
ftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
if
f
tool: Mo
v
e
o
ption
v
alues into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l:
E
liminate global
variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool: Simplify print_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David
Agui
l
ar
t7800: Test difftool pas
s
ing arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool: Provide an em
p
t
y
fi
l
e when ne
e
ded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Ma
k
efile: Improv
e
compile
r
header depen
d
ency
c
heck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
a
r
merge
t
o
o
ls/meld: Us
e
'--output
'
w
hen ava
i
l
a
ble
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Agui
l
ar
merget
o
ol
-
-lib: Ref
a
ctor
tools into sep
a
rate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid
A
guilar
m
ergetool--lib: Ma
k
e
style consist
e
n
t
w
i
th g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
di
f
ftool--he
l
p
e
r:
Make style consistent w
i
th
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-
c
o
m
mit-hook
.
sh: Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-
m
erg
e
to
o
l--lib: Make vimdiff retain
t
he current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
i
l
ar
git:
R
emo
v
e handling
for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
setup: Provide GI
T
_PREFIX to b
u
ilt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync: Update "submodule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
avi
d
Agu
i
lar
mergetool: Skip a
u
toresolved
p
at
h
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
D
o
c
umentation: Exp
l
a
i
n git-mergetool's u
s
e of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
Ag
u
ilar
Makefile:
R
emove usage o
f
d
epre
c
ated
P
y
thon "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Agui
l
ar
diffto
o
l: F
i
x '--gu
i
' when diff
.
guitool is uncon
f
igured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
i
d
Aguilar
t7800
-
difftool
.
sh: Test
m
ergetool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David
A
guilar
difftool: Up
d
at
e
copyr
i
g
h
t notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguil
a
r
difft
o
ol: Use eval to
ex
p
a
nd
'
--extcmd
'
expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uila
r
diff
t
ool: Add '-x' and
as an alias for '-
-
extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
t78
0
0-diffto
o
l
.
sh
:
S
implify
t
he --extc
m
d
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
u
il
a
r
g
it-diff
.
txt: Lin
k
t
o
git-d
i
fftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
la
r
difftoo
l
: Allow specifying unco
n
fig
u
red co
m
mands w
i
th
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
diff
t
ool-
-
help
e
r: Remove use of the GIT_MERGE_TOO
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
difftoo
l
--helper: Up
d
ate copyright and remove distrac
t
ing
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Ag
u
ilar
g
i
t
-di
f
ft
o
ol: Add '--gui' for selecting a
GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguilar
t78
0
0-difftool
:
Se
t
a bogus tool for
u
se by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Aguilar
help:
D
o not unnec
e
ssarily look for a rep
o
sitory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
v
id
A
guilar
submodule
.
c: Squ
e
lch a "use before as
s
ig
n
ment" war
n
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
diff: ge
n
erat
e
pretty filenames in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
id
Aguilar
c
ompat: add a basename() compatib
i
lit
y
f
u
n
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
c
ompat: add a mkst
e
mps() compatibility funct
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
Add gi
t
-replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Agu
i
lar
mergetool-
-
lib: ad
d
suppo
r
t for ara
x
is m
e
r
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
mergeto
o
l--lib: specialize diff
options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool-
-
lib: simp
l
ify API usag
e
by remo
v
ing
m
o
re
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
/
mergetool: refactor c
o
mmands
t
o use git
-
mer
g
eto
o
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
me
r
geto
o
l: use
$(
.
.
.
) instead
o
f `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguil
a
r
bash completion: ad
d
git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
gu
i
l
ar
difftool: add support
for a difftoo
l
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
diffto
o
l
: a
d
d various git-diffto
o
l tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move 'git-difftool' out of cont
r
ib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
ifftool: add a
-
y shortcut
f
o
r --no
-
prom
p
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l: use perl built
-
ins when testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
difftool: remove
t
he
ba
c
kup file
f
eature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
lar
d
ifftool:
r
emove merge op
t
ions
f
or opendiff, t
k
diff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday: u
s
e the dashl
e
ss f
o
rm of git-i
n
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Aguilar
contrib/difftool:
use a separate config namespace
for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
a
vid Ag
u
ilar
c
o
n
t
ri
b
/difftool
:
Don't
rep
e
at merge tool can
d
i
d
ates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Aguil
a
r
difftoo
l
: put t
h
e cursor
on t
h
e editable
file for Vi
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
A
guilar
difft
o
ol
:
fix
d
ocumentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Aguilar
contrib
:
add 'git difftool' for lau
n
c
hing
c
ommon merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David
A
g
uilar
git-merget
o
ol: properly handle "
g
i
t mergetool
-- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Agu
i
lar
tests
:
a
d
d
a testc
a
s
e
for
"
git submodul
e
sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David
Aguila
r
git-sub
m
odul
e
: add "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule: rep
l
ac
e
duplicated
c
ode w
i
th a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gitk: Do
n
't show
l
ocal changes when
w
e
there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree