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
Documentation/branch: document -M and -D in terms of --force
2014-10-16
D
a
v
id Aguilar
m
e
r
g
e
t
o
o
ls/
m
eld: ma
k
e
u
sage of `--output` co
n
f
i
gurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David
Aguilar
gi
t
k: Catch mk
d
t
e
mp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Dav
i
d
Aguila
r
gitk
:
Us
e
m
k
temp -d to
avoi
d
predict
a
ble temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Honor
TMPDIR wh
e
n vie
w
ing external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David
Aguilar
difftool: s
u
pport
r
epositori
e
s wit
h
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David A
g
u
i
lar
pull: add --ff-only to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Aguil
a
r
pu
l
l
:
ad
d
pull
.
ff co
n
fi
g
uration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-send:
eliminate
HMAC deprecation
warn
i
ngs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avi
d
Aguilar
cache
.
h: eliminate S
H
A-1 deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Agu
i
lar
Makefile: add
su
p
po
r
t f
o
r Appl
e
CommonCrypto fa
c
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Dav
i
d Aguilar
M
a
kefil
e
: fix defau
l
t regex settings on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Davi
d
Aguilar
mergetools/kdiff3: do not use --auto when dif
f
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David A
g
uilar
help
.
c: add a co
m
patibili
t
y comment t
o
cmd_versi
o
n()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
i
l
a
r
co
n
t
rib/mw
-
to
-
git/t/instal
l
-wiki
.
sh:
use
a low
e
rcase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
c
o
ntrib/examples/gi
t
-remote
.
perl: use a lower
c
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
t
ests: use a lowe
r
case
"usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
g
i
t-sv
n
: use a lowercase "usa
g
e:"
st
r
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gu
i
lar
Documen
t
atio
n
/use
r
-
m
an
u
al
.
txt: use
a
lowercase "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
guila
r
templates/hooks--update
.
sample: use a lower
c
ase
"
u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/
h
oo
k
s
/
setgitperms
.
perl: u
s
e a lo
w
ercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contr
i
b
/examples: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contri
b
/
fas
t
-i
m
por
t
/impor
t
-zips
.
py: use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
gui
l
ar
contr
i
b
/fast-import/import-zips
.
py: fix broke
n
er
r
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
co
n
trib/fast-import
:
use
a
lowerca
s
e
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
c
ontrib/credential: use a lowercase "usage:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-
c
vsimport: use
a
lower
c
ase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-cvsimport:
use a lowercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-c
v
sexportco
m
m
it: use a
l
o
w
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Ag
u
ilar
git-arch
i
mport: use a lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-
m
erge-one-file:
u
se a lowercase "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relink: use a lo
w
ercase
"usage:
"
st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a l
o
wercase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-s
h
-setup
:
use a lo
w
e
rc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid Aguilar
t
7
800: "defaults" is no longer a builtin tool
n
ame
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid Aguilar
t7800: mode
r
nize
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800:
u
pdate copyright notic
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
diffto
o
l
: silence uninitializ
e
d
v
a
r
iab
l
e
wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
p4merge: fix
printf usag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Aguilar
difft
o
ol--helper:
fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
i
d
A
guilar
doc: g
e
ner
a
te a l
i
st of v
a
lid merge tool
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d Aguilar
mergetool--lib: ad
d
func
t
ions for findin
g
availabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
mergetool-
-
lib: improv
e
t
he help tex
t
i
n guess_me
r
ge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid A
g
uilar
mergetool--lib: simplify c
o
mmand expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
m
e
r
g
e
t
ools: simplify
how w
e
h
a
nd
l
e "
v
im" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
merget
o
ol--l
i
b
:
i
m
prove s
h
ow_tool_he
l
p() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ilar
merget
o
o
l
s/vim: remove
r
ed
u
ndan
t
diff c
o
mm
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
A
guilar
mergetools/p4merge: Honor $T
M
PDIR for the /
d
ev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id Aguilar
m
ergetools/p4merge: Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--lib: Allow custom commands t
o
overrid
e
built-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Agu
i
lar
gitk: Rena
m
e '
t
agcontents'
to 'cac
h
ed_
t
a
g
conten
t
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid
A
gu
i
lar
g
i
tk: Te
a
ch
"Rere
a
d references" to
reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
a
vid A
g
uilar
mergetool
,
difftool:
D
ocum
e
nt
-
-
t
ool-help consi
s
tentl
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
t
ool:
D
isable --s
y
mlinks o
n
cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid
A
guilar
di
f
fto
o
l
: Handle c
o
mpare
(
) re
t
u
r
n
ing
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Agu
i
lar
difftool: Wr
a
p long
li
n
es fo
r
r
eadabil
i
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguila
r
dif
f
tool: Check
a
ll return codes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d A
g
u
i
la
r
diff
t
ool: Handle
f
i
nding
m
ergetools/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
i
l
ar
d
i
fftool: Use symlin
k
s when diffi
n
g
a
gainst the workt
r
ee
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l: Call
t
he temp
director
y
"
g
i
t-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Move optio
n
val
u
es
i
nto a
h
ash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vi
d
Agui
l
ar
difftool: Simplify print
_
tool_
h
elp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
A
g
uilar
t7800: Test
d
ifftool pass
i
ng argu
m
ents
t
o diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Da
v
id Aguilar
mer
g
etool:
P
rovide a
n
e
m
pty file
when
need
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Improve
c
ompiler header dependen
c
y
check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
g
u
ilar
mergetoo
l
s/meld: Use '-
-
out
p
u
t
' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool-
-
lib: Refac
t
or tools i
n
t
o sepa
r
ate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
me
r
getool--lib: Make s
t
yle consis
t
ent with
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
diff
t
o
o
l-
-
he
l
per:
Make sty
l
e consistent with
g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Davi
d
A
guil
a
r
t/t75
0
3-pre-commit-
h
ook
.
sh: Add
GIT
_
P
REFIX
te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Ag
u
ilar
git-merge
t
ool--lib: Ma
k
e
v
i
m
diff retain
th
e
curr
e
nt
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ila
r
git: Remove ha
n
dli
n
g fo
r
GIT_PREF
I
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
i
d
Agui
l
ar
setup:
P
rovide GIT_PRE
F
IX
t
o built
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
su
b
modul
e
s
ync:
U
pdate
"
submo
d
ule
.
<na
m
e>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguila
r
merge
t
ool: S
k
ip autoresolved
paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguila
r
Do
c
u
m
e
n
tation: Explain git-merget
o
ol's
u
s
e of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Aguilar
Makefile:
R
e
m
ove usage of
d
ep
r
e
ca
t
e
d
Python "has_k
e
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguilar
diff
t
ool: Fix
'
--gui' when d
i
ff
.
gu
i
tool is
unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid
Aguilar
t
7800-diffto
o
l
.
s
h: Te
s
t mergetool
.
p
rompt fallb
a
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
A
guilar
difftool: Update
copyright notic
e
s to
list e
a
ch year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
dif
f
tool
:
U
se eval to
exp
a
nd
'--extcm
d
'
e
xpr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Add
'-x' and
a
s an alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
A
g
u
ilar
t
7800-di
f
ftool
.
s
h
:
S
im
p
lify the --ext
c
md test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git
-
dif
f
.
txt: Link
t
o git-diff
t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
diff
t
oo
l
: Allow sp
e
cifying uncon
f
igured c
o
mmands w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diff
t
ool--helper: Remo
v
e use of th
e
GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guil
a
r
d
if
f
to
o
l--helper: Update
copyr
i
ght a
n
d remove
d
istracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
git-dif
f
tool: Add
'--gui' for selecting
a
GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-
d
if
f
tool:
S
e
t a bogus tool
for use
by test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
elp: Do not unnece
s
sarily look
for a repos
i
t
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c:
S
quelch a "us
e
before assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
di
f
f:
g
enerate pretty fi
l
ena
m
es
i
n prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
Agui
l
a
r
c
o
mpat:
a
dd a
b
a
s
ename() compati
b
ility functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
compat: add a
m
kstemps()
c
ompatibi
l
i
t
y functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguila
r
Add git-repla
c
e
to
.
g
i
tignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguilar
me
r
geto
o
l--lib: a
d
d
suppo
r
t for araxis mer
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid A
g
uilar
mergetool--lib:
s
pecialize diff
options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguil
a
r
mergetool--lib
:
simpl
i
fy API usage by removing mor
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
ar
diff
t
o
ol/mergetool: refactor commands to use git-merget
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
mergeto
o
l: u
s
e $(
.
.
.
) inste
a
d o
f
`back
t
icks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next