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
git-svn: use a lowercase "usage:" string
2013-02-24
David Aguilar
git-svn:
use
a
l
ower
c
ase "usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
lar
g
it-sh-setup: use
a
lowe
r
c
a
se "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Agui
l
ar
p4merge: fix printf u
s
age
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
d
ifftool--helper: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguil
a
r
doc:
g
enera
t
e a list of valid merge t
o
o
l
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib
:
add functions for
fi
n
ding
avai
l
able
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
mer
g
e
t
ool--lib: improve
t
he help text
i
n
g
uess_me
r
g
e
_tool(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
mergetool--lib: simplify command expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
mergetools:
s
implify how w
e
handle
"
vim" and
"defaul
t
s"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
A
gu
i
lar
mergetool-
-
l
ib:
impr
o
v
e show_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Ag
u
ilar
m
e
rgetools/
v
im: remove redu
n
dant
diff c
o
mmand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
avid
Ag
u
ilar
mergetools/p4me
r
ge
:
H
onor $TMPDIR
f
or
the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
me
r
getools/p4m
e
rge:
H
a
n
dle
"/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
merg
e
tool
-
-lib: Al
l
o
w
custom commands to overrid
e
built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
git
k
:
Rename
'tagc
o
ntents' to 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vi
d
Aguilar
gitk: Teach "Reread referen
c
es" to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David
A
guilar
merge
t
ool,difftool: Docum
e
nt --t
o
ol-
h
el
p
c
on
s
istently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
difftool: Disable --sy
m
l
i
nks
o
n cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
dif
f
tool: Handle
c
om
p
are
(
) returning
-1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
difftool
:
Wrap long lines for rea
d
ability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
ilar
difftool: Check
a
ll r
e
turn codes fro
m
compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
dif
f
tool
:
Handl
e
finding m
e
r
getools/ i
n
a
path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
difftoo
l
: Use
s
ymlinks when di
f
fing
a
gainst the worktre
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
A
guilar
difftool: Call t
h
e temp d
i
r
ectory "git-difftoo
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Agu
i
lar
diff
t
ool: Move opt
i
on val
u
es into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id A
g
uil
a
r
difftool: Eli
m
i
n
ate global variable
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vi
d
Aguilar
difftool
:
Simplify p
r
i
nt_t
o
ol_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d Aguilar
t
7800:
Test difftoo
l
p
a
ss
i
ng a
r
guments
to d
i
f
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Agui
l
a
r
merge
t
ool: Provide an empty file when need
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
avid Aguil
a
r
Makefile:
Improve c
o
mpi
l
er hea
d
e
r dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
mergetools/meld:
U
se '--o
u
tput' when avai
l
ab
l
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merget
o
ol
-
-lib:
R
efactor tools into sepa
r
ate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: Make style consistent wit
h
g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool
-
-help
e
r
:
Mak
e
style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-commit-h
o
o
k
.
s
h
: Add
G
IT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
id Aguilar
git-merget
o
o
l
--
l
i
b: Make vi
m
diff retai
n
th
e
current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Ag
u
ilar
gi
t
: Remove handling for GIT_PRE
F
IX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setu
p
:
Provide G
I
T_PR
E
FIX to
b
uilt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Agu
i
lar
s
u
bmodule sync:
U
pdate "submo
d
ule
.
<name
>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
merg
e
t
o
o
l: Skip autor
e
solved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Aguilar
Documentation:
E
xpl
a
in g
i
t-m
e
rgetoo
l
'
s
use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David A
g
uilar
Makefile: Remove usage of
d
eprecated Python
"
has
_
key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Aguilar
difftool: Fix '--
g
ui
'
when diff
.
g
u
itool i
s
unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800
-
difftool
.
sh: T
e
s
t mergetool
.
p
r
ompt fa
l
lback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid A
g
u
il
a
r
diffto
o
l: U
p
date copyright notice
s
t
o
list each
y
e
ar
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
Ag
u
ilar
difftool: Use eval to
e
x
pand '--extcmd' expressi
o
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
id Aguilar
difftoo
l
: Add '-x' and as an al
i
a
s for '--extcmd
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
i
d
Aguil
a
r
t7800-difftool
.
sh:
S
implify the -
-
ext
c
md test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguil
a
r
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
Dav
i
d
A
guila
r
difft
o
ol: A
l
low
s
pecifying unco
n
figur
e
d commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool
-
-helper
:
Remove use of the G
I
T_MER
G
E_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid
A
guilar
d
ifftool--helper: Update
c
o
p
yright and
re
m
ove di
s
tracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
uilar
git-diff
t
ool: Add '--gui'
f
o
r se
l
e
c
ting 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
b
y
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Agui
l
ar
h
elp
:
Do n
o
t u
n
necessarily look for a reposito
r
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David
Aguilar
submodule
.
c: Squelch
a
"use bef
o
re a
s
signment" warnin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
diff: gener
a
te
pretty filename
s
in prep_temp_
b
lob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
i
d
A
guilar
compat:
add a basenam
e
(
) compatibili
t
y function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
c
ompat:
a
dd a mkstemps() compa
t
ibility f
u
nct
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
A
dd git-r
e
place to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
Aguilar
merge
t
ool--lib: a
d
d support for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
me
r
getoo
l
--lib: special
i
ze dif
f
op
t
ions
f
o
r
emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
m
e
rgetool--l
i
b: si
m
plif
y
API usage
by remo
v
in
g
more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool/
m
erge
t
ool: refactor comman
d
s to use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
me
r
g
etool: use $(
.
.
.
) in
s
tead of
`b
a
ckt
i
c
ks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguil
a
r
b
ash completion: add gi
t
-di
f
ftoo
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
guilar
difft
o
ol: add support for a difftool
.
prom
p
t
conf
i
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add various git
-
di
f
f
tool te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguila
r
diffto
o
l: mo
v
e '
g
it-difftool' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
a
r
d
i
fftool: add a -y shortcut for --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
d
i
fftool: use per
l
bu
i
lt-ins when
t
e
s
ting for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
remove the backup file featu
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uil
a
r
difftool: remove merge options for
o
pendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
v
i
d Aguil
a
r
everyday:
us
e
t
h
e
d
ashless
f
orm of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
con
t
rib/d
i
f
f
tool
:
use a
s
eparate
confi
g
namesp
a
c
e for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
Aguilar
contri
b
/difftool: Do
n
't repeat m
e
rg
e
t
ool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Aguilar
diffto
o
l: put the cursor
o
n
t
he ed
i
table
f
il
e
for
V
im
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid A
g
uila
r
d
i
ff
t
ool: fix documentation pr
o
b
lems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid Aguilar
contr
i
b
:
add 'git difftool' f
o
r laun
c
hing common m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: properly
h
an
d
le "g
i
t
m
e
r
geto
o
l -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Da
v
id
A
guilar
t
e
st
s
: ad
d
a t
e
stcas
e
for "git submod
u
le sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Dav
i
d Aguilar
git-
s
ubmodule: ad
d
"sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
g
i
t-
s
ubm
o
d
ule: replace duplicated
code
w
ith a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[
PATCH] gitk:
Don't sho
w
local chan
g
es when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree