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
t7610-mergetool: add missing && and remove commented-out code
2014-10-15
David Aguil
a
r
t7610-merg
e
tool: add m
i
ssing && and remove
commented
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-merge
t
o
o
l:
use tabs
instead of a
m
ix of
tabs
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David
A
guilar
di
f
ftool: support repos
i
tories with
.
g
i
t-files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Agu
i
lar
p
u
l
l
: add --ff-on
l
y to the help te
x
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Aguilar
p
u
ll:
a
dd pull
.
ff conf
i
gu
r
ation
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
ima
p
-s
e
n
d: eliminate HMA
C
d
eprecation
warnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Ag
u
ilar
cache
.
h: eli
m
inate SHA-1 deprecation warnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David
A
guilar
Makefi
l
e: add support for Apple
C
ommonCrypto
facility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefile: fix default regex settings
on
D
arwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David
A
guila
r
mergetools
/
k
d
i
f
f
3: do no
t
use
--auto
w
hen diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
Da
v
id
A
guilar
help
.
c: a
d
d
a
com
p
ati
b
ili
t
y
comme
n
t to cmd_version()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
co
n
trib/mw-to-git
/
t/install-wiki
.
sh: use a lowe
r
case
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
contrib
/
e
xamples/g
i
t-re
m
ote
.
p
erl: us
e
a lower
c
ase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests: use a
l
o
werc
a
s
e
"
u
sage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid
A
guilar
git-sv
n
: use a low
e
rcase
"usage:"
s
t
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
Aguilar
Docume
n
t
a
tion/user-ma
n
ual
.
t
x
t:
use a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
t
e
m
p
lates/hooks-
-
u
p
dat
e
.
s
a
mple:
us
e
a lowerc
a
s
e
"
u
sage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
contrib/hook
s
/
s
etgitp
e
rms
.
perl: u
s
e
a lowerca
s
e "
u
s
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
n
t
rib/e
x
amples: use a lowerc
a
se "usage:"
strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-impor
t
/
import-zi
p
s
.
p
y:
use spaces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
contri
b
/fas
t
-
import
/
import-zips
.
py: fix broken erro
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/
f
ast-import: u
s
e a lowercas
e
"u
s
a
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/c
r
e
den
t
ial: use a low
e
rcase "
u
sage:
"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agu
i
l
a
r
git-cvsimp
o
r
t
: us
e
a lowercase "usage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-cv
s
i
m
port: u
s
e a
l
owercase "
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-cvsex
p
o
r
tcommit: use a l
o
w
er
c
ase "usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-archimport: use
a
lowercase "usage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-merg
e
-one
-
file: use a
lowercase "
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-relink: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
g
it-sv
n
: use a lowercase
"
usage:"
s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-sh-setup: use a lower
c
ase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Aguilar
t7800
:
"de
f
au
l
ts"
i
s no l
o
nger a builtin tool name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
uilar
t780
0
: moderniz
e
te
s
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
D
avid Aguilar
t
7
8
0
0: u
p
d
ate copyr
i
ght notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
D
a
v
id Aguila
r
diff
t
o
o
l:
silence uninitiali
z
ed
v
ariable
w
a
r
ning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguilar
p4merge: f
i
x prin
t
f
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Agui
l
ar
diff
t
o
ol--
h
el
p
e
r: fix
printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: ge
n
erate
a
list of valid merg
e
tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
A
g
uilar
mergetool--lib: add functions for finding av
a
il
a
ble
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
rgetool--lib: im
p
rove the help text in gues
s
_
m
erge_too
l
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
mergetool-
-
lib: sim
p
l
i
fy command expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergeto
o
ls: simplify how we han
d
l
e "vim" and
"defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
e
rgetool--
l
ib: improv
e
s
how_tool_help()
o
u
tput
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Agui
l
ar
mergetools/vim: remove redundant
d
i
ff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
avid Ag
u
i
l
ar
merg
e
tools/p4m
e
rge: Hon
o
r $TMPDIR f
o
r
the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id Aguilar
m
er
g
eto
o
ls
/
p
4merge: Handle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
merge
t
ool-
-
lib: Allow custom
com
m
ands t
o
override built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Aguil
a
r
gitk: Rename 't
a
gcontents'
t
o
'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguilar
g
itk: Teac
h
"Reread references" to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
avid Aguilar
mergeto
o
l
,difftool: Doc
u
m
e
nt --tool-h
e
lp
consi
s
ten
t
ly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
g
uilar
difftool: D
i
sable --symlinks on
c
y
g
w
i
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
difftool: Handle compare() retu
r
ni
n
g -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uil
a
r
difftool: Wrap long li
n
es for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguil
a
r
difftool: Chec
k
al
l
r
eturn codes
f
r
om compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
u
i
lar
difftool: Han
d
le finding merg
e
tools/ in
a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
A
g
uilar
diff
t
o
ol: Use sym
l
i
nk
s
when
d
iffing ag
a
inst the w
o
r
k
tree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguila
r
difftool: Call the temp director
y
"git-difftool
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
dif
f
t
o
o
l:
M
ove option values
into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Ag
u
ilar
d
i
ff
t
ool: E
l
iminate global variab
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difftool: Simp
l
i
f
y
p
rint_tool
_
help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t78
0
0: Test difftoo
l
passing argume
n
ts to d
i
ff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
A
g
ui
l
ar
merg
e
tool: Provide an emp
t
y
file
when
n
eeded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Ag
u
ilar
Makef
i
l
e:
Improve compiler
header dependency ch
e
ck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
mergetools/meld:
U
se '
-
-outp
u
t' when availab
l
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
A
g
uilar
mergetool--
l
ib:
Re
f
actor too
l
s int
o
separate f
i
l
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Aguilar
merget
o
ol--lib: Make sty
l
e consistent with
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid A
g
uilar
difftool-
-
helper:
Make st
y
le 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-commit
-
hoo
k
.
s
h:
A
d
d
GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-merge
t
ool
-
-lib: Make v
i
m
d
iff retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avi
d
Agu
i
lar
gi
t
: Rem
o
ve handling for GIT_PREFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
u
i
lar
setup: Provide GIT_PR
E
FIX to buil
t
-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submod
u
le sync:
Upd
a
t
e "s
u
bmodule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
avid Aguilar
mergetool: Skip autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentati
o
n
:
Exp
l
ain g
i
t-mergetool's use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Aguilar
Makefile: Remove usage
of deprec
a
ted
P
yth
o
n "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguil
a
r
d
ifftool: Fix '--gui' when diff
.
g
u
itool
i
s unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Agu
i
l
a
r
t
7800-difftool
.
sh: Tes
t
m
ergetool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid
A
guilar
difftool: Update copyright notices
to
l
ist each
y
ear
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
a
r
difftool
:
Use eval to
exp
a
nd
'--e
x
t
cmd' ex
p
ressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
d
i
fftool: Add '-x' and as
an alias fo
r
'--extcm
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
t7800-d
i
ffto
o
l
.
sh: Simplify the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
git
-
diff
.
txt: Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: A
l
low s
p
ec
i
fy
i
ng unconfigured commands wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
di
f
f
tool
-
-
helpe
r
: Remove u
s
e of
the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avi
d
Agu
i
lar
difftool--he
l
per
:
Update copyright and remove dist
r
acti
n
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
git-dif
f
tool: Add
'--gui' for se
l
ecting a GU
I
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t78
0
0-difftoo
l
:
S
e
t
a bogus tool f
o
r use b
y
t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Ag
u
ilar
help: Do
not
u
nnece
s
sarily
l
ook for a reposit
o
ry
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David
Agu
i
lar
sub
m
odule
.
c:
Squelch a "
u
se before assignmen
t
" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
di
f
f
:
generate pretty filename
s
in
p
rep
_
temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
compat: a
d
d a
b
asename()
c
ompat
i
bility f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
co
m
pat: add a mk
s
temps() compatibili
t
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
Add
git-replace
to
.
gitign
o
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
merge
t
o
ol--lib: add
s
uppo
r
t
f
or araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
av
i
d A
g
uilar
me
r
getool--lib: specialize diff options fo
r
emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Ag
u
ilar
mergeto
o
l--lib: si
m
p
lify API usage by rem
o
ving
more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool/me
r
getool: r
e
factor
c
ommands to
use git-merge
t
ool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool
:
use $(
.
.
.
) in
s
t
e
ad of `backtic
k
s`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bas
h
c
o
m
ple
t
ion: add g
i
t-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool:
add
sup
p
ort fo
r
a diffto
o
l
.
pro
m
pt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next