repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'da/mergetool-temporary-directory'
2014-10-16
David Ag
u
ilar
t7610-mergetool: add test cases for me
r
getool
.
writeToTe
m
p
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
mergeto
o
l: add
a
n option for writ
i
n
g
to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguila
r
mergetool: use more cons
e
r
vative temp
o
r
a
r
y
fi
l
ename
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d
A
g
u
ilar
test-lib-functions:
a
dju
s
t styl
e
to
m
atch
C
od
i
n
g
Gui
d
elines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
t7610-merge
t
o
ol: use test_confi
g
to isolate tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
il
a
r
git-sh-
s
e
t
up
:
move GI
T
_
D
IR init
i
alization into a
f
unc
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
mergeto
o
l: use more conserva
t
ive temporary
filen
a
mes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-
l
ib-
f
unc
t
io
n
s
:
adjust style to
m
a
tch CodingGu
i
delines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
761
0
-m
e
rgetool: pr
e
fer tes
t
_con
f
ig o
v
er git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t7610-merge
t
o
o
l: add missing
&
&
and remove
commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
g
uilar
t7610-mergetool: u
s
e tabs instea
d
o
f a
m
i
x of tab
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David
Aguilar
com
p
l
e
tion: add --s
h
ow-signature fo
r
log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
avi
d
A
g
uilar
s
t
ash: prefer -
-
quiet ov
e
r
shel
l
r
edirection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
A
g
uilar
refs: ma
k
e rev-parse
-
-
quiet ac
t
u
a
ll
y
q
uiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1
5
03: use t
e
s
t_
m
u
st_be_em
p
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Da
v
id
Ag
u
i
lar
Docum
e
ntation: a note about st
d
o
u
t for
g
i
t rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
cleanu
p
s: ensure that git
-
com
p
at-util
.
h is
included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
stylefix: asterisks
s
tick to th
e
va
r
iable,
not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gitk: Catch mkdt
e
mp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id Agu
i
la
r
gitk: Use
m
ktemp -
d
to avo
i
d predictable
tem
p
orary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguil
a
r
gitk:
Ho
n
or T
M
PDI
R
when viewing
ex
t
ernal diff
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguil
a
r
diff
t
ool:
s
u
pport repositories with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pu
l
l:
a
dd --ff-only to
t
h
e
help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull
:
add
pu
l
l
.
f
f c
o
nf
i
gu
r
at
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Da
v
i
d
Aguilar
imap-sen
d
: el
i
m
i
n
a
te HM
A
C
d
ep
r
e
cation war
n
ings
o
n M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Agu
i
lar
cache
.
h
:
elimi
n
a
t
e SHA-1 depre
c
at
i
o
n warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
g
u
ila
r
Makef
i
le: a
d
d support for Appl
e
C
o
mmon
C
rypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
avid
A
g
uilar
Makefile
:
fix d
e
fau
l
t regex settings o
n
Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
avid A
g
u
ilar
mergeto
o
ls/kdiff3: d
o
not
u
s
e
-
-auto
when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
Agui
l
ar
help
.
c:
add a compa
t
i
bilit
y
comme
n
t
to
cmd_version(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
i
d
A
guilar
con
t
r
ib/mw-to-git/t/inst
a
ll-wiki
.
sh: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
c
ont
r
ib/examples/git-remote
.
pe
r
l
:
use
a
lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
tests: u
s
e a lowercase "usa
g
e
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
git-svn: use
a
lo
w
ercase "u
s
a
ge
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
Agui
l
ar
Documentation/user-man
u
al
.
t
xt: use a lowercase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Aguilar
templat
e
s/h
o
oks
-
-update
.
sample: use a lowerca
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/hooks/se
t
gitpe
r
m
s
.
perl: use a lowerca
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agu
i
lar
contrib
/
examples: use a lo
w
ercase "us
a
g
e:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
cont
r
ib/fast-import/import-zips
.
py
:
use sp
a
ces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
con
t
rib/fast-import/impo
r
t
-
z
i
ps
.
py:
f
ix b
r
oken
error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
contrib
/
fas
t
-i
m
port: use a
lowercase "
u
sage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/credential: use a lowercase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uila
r
g
i
t-cvsimp
o
rt: use a lowerc
a
se "
u
sage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
guil
a
r
git-cvsimpo
r
t: use a lowerc
a
se "usage:
"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-cvs
e
x
portcommit: use a lowercase "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t
-archimport: use a lowercase "usag
e
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-me
r
ge-on
e
-file: u
s
e
a l
o
we
r
case
"usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
g
i
t-re
l
ink:
u
se a
lowerca
s
e
"
usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-svn
:
use a lower
c
ase "usa
g
e:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-set
u
p: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid A
g
u
ilar
t7
8
00: "de
f
aults" is n
o
longer
a
b
u
iltin t
o
o
l
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
v
i
d
Aguilar
t7800: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David A
g
uilar
t7800: upda
t
e
copyrigh
t
noti
c
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: sile
n
ce unin
i
tialized
variable
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Aguilar
p4merge
:
fi
x
printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool--h
e
lper
:
fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: genera
t
e
a
li
s
t of
v
alid merg
e
to
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d Aguilar
merget
o
ol--
l
ib: add functions for fi
n
di
n
g availabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib: i
m
prove the help text in
guess_merge_tool
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
gui
l
ar
mergetool--lib
:
simpl
i
fy command expres
s
io
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
m
ergetools: s
i
mpli
f
y h
o
w we handle "
v
i
m
" and
"
defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Ag
u
ilar
mergetool-
-
lib:
i
mpr
o
v
e show
_
too
l
_help()
o
utput
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools
/
v
im: remove
r
edundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
merg
e
t
ools/p4merge: Honor $TMPDIR for the
/dev/
n
ull
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
avid Aguilar
m
erget
o
ols/p4me
r
g
e:
Handle "
/
dev/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Da
v
id A
g
uilar
merge
t
o
o
l
-
-lib: A
l
low cu
s
to
m
comm
a
nds to overr
i
de built-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Agui
l
ar
gitk: Re
n
a
me
'
ta
g
c
o
ntents' to 'c
a
ched_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
i
t
k
: T
e
ach "Rer
e
ad
r
e
f
e
r
enc
e
s" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,difftool: Document --
t
ool-help
c
onsisten
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
difft
o
ol: Disable --sym
l
inks on
c
ygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id
A
g
u
i
lar
d
i
fftool: Handle compare() returnin
g
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
tool
:
Wrap long
li
n
es fo
r
read
a
bi
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
d
i
fftool: Check all return cod
e
s fr
o
m com
p
are()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid
A
g
u
ila
r
di
f
ftool:
H
a
nd
l
e fi
n
ding me
r
getools/ in
a
path
wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguil
a
r
difftool: Us
e
symlinks when diffing ag
a
inst
t
he
w
o
rktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
di
f
f
t
o
o
l: Call the
t
emp direct
o
ry "g
i
t-difft
o
ol"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Agu
i
lar
difftool:
M
ove op
t
ion va
l
ues into a h
a
sh
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool: Eliminate globa
l
variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool: Simplify print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Ag
u
ilar
t
7
8
00: Test difftoo
l
pas
s
ing arguments to di
f
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David
A
guil
a
r
merge
t
ool: Provi
d
e an emp
t
y
f
i
l
e when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Improve
compiler header dep
e
n
dency ch
e
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
me
r
getools/meld:
Use
'
--outpu
t
' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: Refactor
tools into separa
t
e fi
l
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
g
uil
a
r
mergetool--lib: Make style cons
i
stent wit
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool--helper: Make style co
n
sistent wit
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t
/
t7503-pre-commit-ho
o
k
.
sh: Add GIT_PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avi
d
A
g
u
il
a
r
g
it-m
e
rgetool--
l
ib: Mak
e
vimdiff retain t
h
e
c
ur
r
ent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
i
d Aguil
a
r
git
:
Remov
e
handling for GIT_P
R
EFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
s
e
t
up: P
r
ov
i
de GIT_PREFIX
t
o
b
u
ilt-
i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
s
u
b
module sync: Update "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d
A
g
uila
r
m
e
rge
t
o
ol:
Skip a
u
tores
o
lved path
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id
A
gui
l
a
r
Documentation: Explain
g
it-merg
e
tool's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Agu
i
l
ar
Makefile: Remove
usage of d
e
p
recated
Python
"has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
i
d Aguilar
difftool: Fix
'
--gui' when diff
.
gui
t
ool is unconfigure
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Ag
u
il
a
r
t7800-difftool
.
s
h
:
Test m
e
rgetool
.
prompt
f
allb
a
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difft
o
ol: Upda
t
e copyright not
i
c
e
s
t
o list
each y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
diffto
o
l: Use
e
v
al t
o
e
x
pand '--extcm
d
'
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
difft
o
ol:
Add '-x' and as
an al
i
as for '
-
-
extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
i
d Aguilar
t78
0
0-difftool
.
sh: Simplify
the --ex
t
c
m
d te
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next