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
git-sh-setup: move GIT_DIR initialization into a function
2014-10-15
David Aguilar
git
-
sh
-
setup:
move GIT_DIR init
i
alizati
o
n 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 co
n
servative tempo
r
ary fi
l
enames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid
A
guilar
t
est-lib-f
u
nctions: ad
j
u
s
t
sty
l
e
t
o match Cod
i
n
g
Guidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David
A
gu
i
lar
t76
1
0-m
e
r
g
e
t
o
ol
:
prefer t
e
st_config over git
config
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid A
g
uil
a
r
t
7
610-mergetool: add mi
s
sing && and
remov
e
commente
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
avid
A
g
u
ilar
t7610-mergeto
o
l:
u
s
e
tabs instead
o
f a mix of
t
ab
s
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David
A
gu
i
l
ar
difftool: support repositories wi
t
h
.
git-
f
iles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
D
avid Aguil
a
r
pull: add --ff-only
to the help text
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull
:
add pul
l
.
ff configuratio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David Aguila
r
im
a
p-send: eli
m
inate HMAC d
e
pr
e
ca
t
ion warni
n
gs on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
D
avid
A
g
u
i
lar
cache
.
h: e
l
imina
t
e SHA
-
1
deprecation warning
s
on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
D
avid Aguilar
Makefile
:
a
d
d
s
upport
f
or App
l
e
CommonCrypto facility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
David
A
g
uilar
Ma
k
efile: fix de
f
ault r
e
gex settings on Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kdif
f
3: do not use
--auto when diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David Ag
u
ilar
h
e
lp
.
c: add a com
p
atibility
c
omment to cmd_version()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
ar
contrib/mw-to
-
gi
t
/t/insta
l
l
-wi
k
i
.
sh: use a
l
owerca
s
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vi
d
Agu
i
lar
contrib/ex
a
mpl
e
s
/
g
it-remote
.
pe
r
l:
use a
low
e
rca
s
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Agu
i
lar
tests: use a lowerc
a
s
e
"usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid A
g
uilar
git-svn: use
a
lo
w
ercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
Docu
m
e
n
t
a
t
ion/use
r
-manua
l
.
txt: use a lowercase
"usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
templates/hooks
-
-u
p
date
.
s
a
mp
l
e:
use
a
lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
guilar
con
t
rib/
h
ooks/
s
etgitperms
.
p
e
rl:
use
a
l
owercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
c
o
ntrib/exam
p
l
e
s: use
a lowercase "usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agui
l
ar
contrib/
f
ast-
i
m
port/i
m
p
ort-zip
s
.
py: use sp
a
ces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Aguilar
contrib/
f
ast-imp
o
rt/imp
o
r
t-zips
.
p
y
: fix
brok
e
n
e
rro
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contr
i
b/f
a
st-import: use a lowercase "
u
sage:" s
t
ri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib
/
credential: use a lower
c
ase "usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguil
a
r
git-cvsimport: us
e
a lo
w
e
r
c
ase "usage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gui
l
ar
git
-
cvs
i
mport:
use a lo
w
erc
a
s
e "
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvse
x
portco
m
mit: us
e
a low
e
rcase "usage:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
guilar
git-
a
rchimp
o
rt: us
e
a lowerca
s
e "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gui
l
a
r
gi
t
-merge-o
n
e-file: use a
l
owercase "usag
e
:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-r
e
link: use a
lo
w
ercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-s
v
n: use a lowerca
s
e "usag
e
:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Agu
i
lar
gi
t
-sh-setup: use
a
low
e
rcase "usage:"
s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Agu
i
lar
t7
8
00: "defaults" is no longer a buil
t
in too
l
name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Aguilar
t
7
8
00: modernize tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Agu
i
lar
t7800: update cop
y
right n
o
tice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
Davi
d
Aguilar
difftool: silenc
e
u
n
initializ
e
d v
a
riable warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
Ag
u
ilar
p4merge: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
di
f
fto
o
l--helper: fix p
r
int
f
us
a
g
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
i
d
Aguilar
d
o
c: gen
e
rate
a
list of
v
al
i
d merge
t
ools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Aguilar
merge
t
oo
l
-
-lib: add
functions
f
o
r
finding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
me
r
getool--lib: improve the help t
e
x
t
in guess_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d
Aguilar
m
erget
o
ol
-
-lib: s
i
mplify c
o
mma
n
d
expre
s
sions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
m
ergetools: simplify how w
e
handle "vim" a
n
d "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
i
d Agu
i
lar
merget
o
ol--lib
:
i
m
prove show_t
o
ol_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
avid
A
g
uilar
merge
t
ools/vim: r
e
move r
e
dundant diff c
o
mmand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid
Aguilar
mergetools/p4m
e
rge:
H
onor $TMPDIR
f
o
r
the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mergetools/p4merge: Handle
"
/
d
ev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--l
i
b: Al
l
ow custo
m
comm
a
nds to overri
d
e
built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
u
ilar
gitk: Rename 'ta
g
c
o
ntent
s
' to 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
gitk:
Te
a
c
h
"Rerea
d
references" to reloa
d
tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
merge
t
ool,difftoo
l
: Docu
m
e
n
t -
-
tool-help
c
onsisten
t
ly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
diff
t
ool: Disable -
-
symlinks o
n
cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uila
r
d
i
f
f
tool:
H
andle
c
ompare() returning
-
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
la
r
difft
o
ol:
W
rap long
l
ines
for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Aguila
r
difftool: Chec
k
all return
c
o
des from co
m
par
e
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Agui
l
a
r
d
i
ff
t
oo
l
: Hand
l
e finding mergetoo
l
s
/ in a path
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftool: Use syml
i
n
k
s w
h
en
diffin
g
agains
t
the wor
k
tree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difftool: C
a
ll
t
he temp direc
t
ory "git-diff
t
ool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftoo
l
:
M
ove option value
s
into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
d
i
fftool: Elimina
t
e glo
b
al va
r
iables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d A
g
uilar
difftoo
l
: Simplify print_tool_
h
e
l
p
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d Aguilar
t
7
800:
T
est dif
f
too
l
passin
g
argume
n
ts to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
Davi
d
Aguilar
m
e
rg
e
t
ool: Provide an emp
t
y file when n
e
eded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David
A
gu
i
lar
Makef
i
le:
Improve co
m
piler he
a
der dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
merge
t
ools/meld:
Use '--output'
w
hen availab
l
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
g
uilar
mergetool--
l
ib: Refacto
r
tools into separate fil
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
merget
o
ol--lib
:
Make style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
dif
f
tool--he
l
per
:
Make style con
s
istent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
D
avid
A
gu
i
lar
t/t7503-pre-co
m
mit
-
ho
o
k
.
sh: Add GIT_PRE
F
IX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d
Aguilar
git-merg
e
tool--lib: Ma
k
e vimdiff
reta
i
n
th
e
cu
r
rent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
i
d
Aguilar
gi
t
: Remov
e
h
a
ndling for
G
IT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
la
r
setup: Provid
e
GIT_
P
REFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
id Aguilar
s
ubmodule s
y
nc: Upda
t
e "submodule
.
<n
a
me>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid Aguila
r
mer
g
etool: Ski
p
a
u
t
o
resolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Ag
u
ilar
D
o
cumentation: Expla
i
n
git
-
mergetool's use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile:
R
emove usage of de
p
recat
e
d Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
a
v
i
d
Aguil
a
r
difftool: Fix
'--gui' wh
e
n diff
.
guitool
is u
n
c
o
nfigu
r
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Agu
i
lar
t7
8
00-difftool
.
sh:
Tes
t
mergetool
.
prompt fallba
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Dav
i
d A
g
uilar
difftool
:
Update copyright notices to list each
y
ear
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d A
g
uilar
difftool: Use eval
t
o e
x
pan
d
'--extcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
dif
f
tool: 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
D
a
vid Aguilar
t7800-difftool
.
sh: Simplify the
--extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Aguilar
git-diff
.
tx
t
:
Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fft
o
o
l:
Allow
s
p
ecifyin
g
u
nc
o
nf
i
gured c
o
mmands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difft
o
ol--help
e
r: R
e
m
ove use of the GIT
_
M
E
R
GE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--help
e
r: Upda
t
e copyri
g
ht a
n
d
remove
d
is
t
racting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Agu
i
lar
g
it-difftool:
A
dd '--gui' for selecting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
t
7
800-difftool: Set a
bogus t
o
o
l
f
or use by
t
e
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
i
d
Aguilar
h
e
lp: D
o
not unnecessa
r
ily look f
o
r
a
repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d Aguilar
su
b
module
.
c: Squelch a "use befo
r
e
a
ssi
g
nment" war
n
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguila
r
diff: generate pre
t
ty f
i
lenames
in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
ompat
:
add
a
b
a
sename
(
) c
o
mpatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
compat:
add a mkstemps() compatibility fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add gi
t
-re
p
lace to
.
gitig
n
ore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--
l
ib: add su
p
port for araxis
m
erge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
mergetool--lib: specialize diff option
s
for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid Aguilar
mer
g
e
t
ool--lib: simplify A
P
I usage
by
re
m
oving mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next