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: use test_config to isolate tests
2014-10-16
David
A
guilar
t7610-mergetool: us
e
test_config t
o
isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
t7
6
10-mergetool: ad
d
m
issing
&& and remove c
o
mmented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t761
0
-
m
ergetool: use tab
s
i
n
stead of a mix
of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Davi
d
Ag
u
ilar
difftool: suppo
r
t
r
e
p
o
s
itories with
.
git-f
i
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
Aguilar
p
ull: add --ff-o
n
ly
t
o the he
l
p
text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add pull
.
ff configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Dav
i
d Aguilar
ima
p
-se
n
d
: eliminate HMAC deprecat
i
o
n
war
n
i
n
gs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David A
g
uilar
cache
.
h: eliminate
S
HA-1 depre
c
a
t
ion warni
n
gs
o
n Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Ag
u
ilar
Makefile: add
s
upport for Ap
p
le Commo
n
Crypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefile: fix default r
e
gex
s
ettings
o
n Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Agui
l
ar
me
r
getools/kdiff3:
do n
o
t
use
--auto when diffi
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vi
d
Aguilar
help
.
c
:
add
a
c
om
p
a
ti
b
ility co
m
ment to cmd
_
v
ersi
o
n
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
lar
contrib/m
w
-to-git/t
/
in
s
t
a
ll-
w
i
k
i
.
sh: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
contrib/
e
xamples/gi
t
-remote
.
p
erl
:
use a
l
o
w
ercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
tests
:
use a lowercase "us
a
ge
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
g
i
t
-
svn:
us
e
a lowercase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
Documentation/use
r
-manual
.
t
x
t: use a lowercase
"
usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguilar
t
e
mpl
a
tes/ho
o
ks--updat
e
.
s
a
mple: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agui
l
ar
contrib/ho
o
ks/setgitperms
.
perl: us
e
a
lowe
r
case "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
uilar
contrib/examp
l
e
s: use a l
o
w
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contri
b
/fast-impor
t
/
import-z
i
ps
.
py:
u
se spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/fast-
i
mp
o
rt/import-zips
.
p
y
: fix brok
e
n error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
c
ontrib/fast-im
p
ort: use a lowe
r
case
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ila
r
contri
b
/credentia
l
: use a lowerca
s
e "usage:"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-
c
vsimpo
r
t: use a lowercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
ilar
g
it-cvsimport: use a lowercase "usage
:
" s
t
rin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
Aguilar
git
-
cvsexport
c
ommit: use a lo
w
ercase "usa
g
e
:"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-archimport: use a lowercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguilar
git-m
e
rge-one-file: u
s
e a lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-rel
i
nk: use a
lo
w
e
r
c
ase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-sv
n
: use
a
lower
c
ase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
s
h
-setup: use
a lo
w
ercase "
u
s
ag
e
:
"
s
t
rin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Aguil
a
r
t7800: "
d
efaults" is n
o
l
onger a builtin tool
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Aguilar
t7800: mo
d
ernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: update c
o
pyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David
A
g
uilar
dif
f
tool: silence
u
nin
i
tialized variable warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Aguilar
p4merge: fix printf
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id
A
g
u
ilar
diffto
o
l--h
e
l
per: fix prin
t
f usag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
do
c
: generate a l
i
st o
f
valid mer
g
e too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib: add functions for finding
availa
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
mer
g
eto
o
l--lib:
i
mprove the help
t
ext in guess_m
e
rge_to
o
l(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
mergetoo
l
--li
b
: simplify command expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
m
ergetool
s
:
simplify how we han
d
l
e
"vim" an
d
"
d
e
faults
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguila
r
m
e
r
get
o
ol--li
b
:
i
m
prove show_t
o
o
l
_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguil
a
r
mergetools/v
i
m: remove redundant
d
iff
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
merget
o
ols
/
p4merge
:
Honor
$
TMPDIR for the /
d
ev/n
u
l
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
m
e
rget
o
o
l
s
/
p4merg
e
: Handle
"
/de
v
/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David
A
guilar
mergetool--lib: Allow c
u
stom comma
n
ds to overrid
e
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
guilar
gitk: Rename 'tagcontents'
t
o
'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gi
t
k: Te
a
ch
"Re
r
e
a
d references" to reloa
d
tag
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
avid Aguilar
me
r
get
o
ol
,
diff
t
ool: Doc
u
ment
-
-tool-help con
s
i
st
e
ntly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difft
o
ol: Di
s
able --syml
i
nks on c
y
gwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
di
f
ftool: Handle compare() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
id Agu
i
lar
difftool:
W
r
a
p
l
o
n
g
lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguila
r
di
f
ftool: Check all re
t
urn
c
odes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguila
r
diffto
o
l: Handle find
i
ng
m
ergetool
s
/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use sy
m
links when
diffing against
t
he work
t
ree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
ool: Call the temp directory
"
git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id
A
guilar
d
i
fftoo
l
: Move option va
l
ues
into a
h
ash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftoo
l
: Elimin
a
te global variab
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
difftoo
l
: Simplify print_tool_help
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Test
d
ifftool passing
arguments
to dif
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Dav
i
d Aguilar
mergetool: P
r
ovide an e
m
pty file when neede
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
a
v
id Agu
i
l
a
r
Makefil
e
: Im
p
rove c
o
mpil
e
r hea
d
er
d
epen
d
e
ncy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
m
e
rgetool
s
/meld: Use
'
-
-output
'
when a
v
a
ilable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
m
ergetool--lib: Refacto
r
too
l
s into
separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Agui
l
ar
mergetool--lib: Make
s
tyle cons
i
stent wit
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
d
i
f
ftool--helper
:
Make style cons
i
stent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
id
A
g
uilar
t/t7503-pre-co
m
mi
t
-hook
.
sh: Add
GIT_PREFIX
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-
m
e
r
geto
o
l--l
i
b: M
a
ke vimdiff retain the cu
r
rent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avi
d
Aguilar
git: Re
m
ove handling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Ag
u
ilar
setup
:
Provide GIT
_
PREFIX t
o
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule
s
y
nc:
U
pdate "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguil
a
r
mergetool: Skip
a
utoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David A
g
u
i
lar
D
ocumentati
o
n: Expla
i
n
git-mergetool's use
o
f t
e
m
pora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
Agu
i
lar
M
ake
f
ile:
R
emov
e
usage of deprec
a
ted Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '--gui' when diff
.
guit
o
ol is unconfi
g
ured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David A
g
uila
r
t7800
-
d
i
ff
t
ool
.
s
h: Test
m
ergetool
.
p
rom
p
t
f
a
llba
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
A
guilar
dif
f
tool:
U
p
da
t
e c
o
pyright notices
t
o
list e
a
ch year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguil
a
r
di
f
ftool: Use eval to expand '--extcmd
'
expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
d
ifftoo
l
:
A
dd '
-
x' and as
an ali
a
s fo
r
'--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t
7
8
00-
d
ifftool
.
sh: Simplify
t
he --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
git-
d
i
ff
.
tx
t
:
Link to
g
it-difftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool:
A
ll
o
w specifying
u
nconf
i
gured
c
om
m
ands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d A
g
uil
a
r
d
ifftool--helper: Rem
o
ve use of t
h
e GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difft
o
ol--helper: U
p
date
c
opyr
i
gh
t
a
nd re
m
ove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
git-difftool: Add '-
-
gui' fo
r
s
e
lect
i
ng a GUI
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
uilar
t7800-dif
f
tool:
Set
a
bogu
s
tool for
use
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David A
g
uilar
help: Do not
u
nneces
s
arily lo
o
k for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
su
b
modu
l
e
.
c: S
q
uelc
h
a "use before a
s
signment"
w
ar
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
diff: generate pretty filename
s
in
p
rep_
t
emp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
c
o
mpat: ad
d
a ba
s
e
n
ame() compatibil
i
t
y
f
un
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Agui
l
ar
compat: add
a
mkstemps
(
)
c
ompatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add
git-replace
t
o
.
gitigno
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d Aguilar
merge
t
ool--lib: add
support
for araxi
s
merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Davi
d
Aguilar
mergetool
-
-lib:
s
pecialize dif
f
o
ptions for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
A
guilar
merg
e
t
ool--lib:
si
m
p
l
ify API usa
g
e by removing
mor
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguil
a
r
diff
t
o
o
l
/
mergetool: r
e
f
actor c
o
mmands to use git-mer
g
et
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
me
r
getool: use $(
.
.
.
) instead
o
f
`
b
a
c
k
t
ic
k
s`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
bash completion: add g
i
t-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next