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
remote.c: drop extraneous local variable from migrate_file
2015-07-23
David
Aguilar
contrib/subtree
:
ign
o
re log
.
date configura
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
avid Agui
l
ar
mergetools: add win
m
erge as a builtin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Da
v
i
d
A
guilar
merget
o
o
l
--l
i
b: set IFS for difft
o
ol and mergetoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Ag
u
ilar
m
e
rgetool
s
: st
o
p sett
i
ng
$
status in merge_c
m
d()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
avid Aguil
a
r
merge
t
o
o
l:
s
i
m
plif
y
conditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
guilar
diffto
o
l--
h
elper: add ex
p
lic
i
t exit st
a
tement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
merg
e
tool
-
-lib: remov
e
use of $s
t
atu
s
global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
D
a
vid Aguil
a
r
difftool: h
o
n
or --tr
u
s
t
-exit-code for builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Agui
l
ar
difftool:
a
dd support for
-
-t
r
ust-ex
i
t-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
t7
6
10-mergetool: a
d
d
test ca
s
es for mergetool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool: add
a
n
option f
o
r writi
n
g t
o
a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merget
o
ol: use
more c
o
nserva
t
ive
tem
p
o
r
ary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
test-lib-
f
unctions: adj
u
st st
y
le to
ma
t
ch
C
odingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
t7
6
10-mergetoo
l
:
use test_config
t
o
i
sol
a
te tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Agu
i
lar
mergetools/meld
:
make usage o
f
`
-
-output` co
n
figurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uila
r
git-sh-setu
p
: move G
I
T_DIR i
n
itializat
i
on into a f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
merg
e
tool: use mo
r
e c
o
nservative temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
test-lib-functio
n
s: adjust style t
o
mat
c
h
Codi
n
g
Guide
l
ines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7610-mergetool: p
r
efer test_
c
onf
i
g
over gi
t
config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
t7610-merge
t
ool: add missing && and remo
v
e com
m
ented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool: use
t
abs i
n
stead of a mix o
f
tab
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Dav
i
d
A
gu
i
l
a
r
comp
l
etion: ad
d
--sh
o
w
-signature for log and sho
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
a
v
id
Ag
u
i
l
a
r
stash: prefer
-
-
q
u
iet over shell redirection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David
Ag
u
ila
r
ref
s
: ma
k
e rev-parse
--quiet
a
ctually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503: use
t
est_must_be_e
m
pt
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguila
r
Docu
m
entation: a note a
b
ou
t
st
d
out for git r
e
v-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d
A
g
u
ilar
cleanu
p
s: ensure that gi
t
-co
m
pat-ut
i
l
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David
Aguilar
s
t
ylef
i
x: asterisks stick t
o
the
var
i
able
,
not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
avid Agu
i
l
a
r
g
i
tk: Ca
t
ch mkdtemp e
r
rors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David
Ag
u
ilar
gitk: Use mk
t
emp -d
to av
o
id pred
i
ctable tempor
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
avid Ag
u
ilar
gitk
:
H
o
nor TMPDIR when viewing external d
i
ffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
D
a
vid Agu
i
lar
difftool: s
u
pport r
e
positories with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vi
d
A
guilar
p
u
l
l
: add --ff-on
l
y
to
t
he help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avid Aguila
r
pull: a
d
d pu
l
l
.
f
f configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vid
A
guilar
imap-se
n
d
:
eliminat
e
HMAC deprecation warning
s
on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h
:
eliminate
S
HA-1 d
e
pre
c
ation
w
a
rnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
Aguilar
Makefile
:
add suppor
t
for
A
pple C
o
mmonCrypto
f
a
c
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
a
vid Aguilar
M
ake
f
i
le: fi
x
default re
g
ex se
t
tin
g
s on Dar
w
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Dav
i
d Aguilar
mergeto
o
l
s
/kdi
f
f
3
: d
o
not use
-
-auto when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Agui
l
ar
he
l
p
.
c: a
d
d
a c
o
mpa
t
i
b
ili
t
y comme
n
t to
c
md_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
co
n
t
rib/mw
-
to-
g
it/t/install
-
wi
k
i
.
s
h: use a low
e
r
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
con
t
rib/e
x
amples/git-rem
o
te
.
pe
r
l
:
u
s
e a lo
w
ercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
t
e
s
ts: use a
low
e
rcas
e
"usage:"
s
t
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
g
it-svn:
use a
l
owerca
s
e
"usage:
"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
guilar
Documentation/user-manual
.
txt: use
a lowercase "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ila
r
te
m
p
l
ates/hooks--update
.
sa
m
p
l
e
:
use a low
e
rca
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contrib/hooks/setg
i
tperms
.
perl: use a lowerc
a
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
con
t
rib/example
s
: us
e
a lowercase "us
a
ge
:
" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contrib/fa
s
t-import/import-zi
p
s
.
py: use space
s
inste
a
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guila
r
c
o
ntrib/fast
-
i
m
port/
i
mport-zips
.
py: fix
b
ro
k
en err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguila
r
c
o
ntri
b
/fas
t
-imp
o
r
t: us
e
a
l
owerc
a
se
"
usa
g
e
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contrib/cred
e
ntia
l
: use
a
lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git
-
cvsim
p
ort: use
a
lowercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-cvsimport: use a low
e
rcas
e
"usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-
c
vsexportc
o
mmit: use
a lowerc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archimport: u
s
e a low
e
rc
a
se "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merg
e
-one-
f
ile:
us
e
a lowercase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git
-
r
elink
:
use
a lo
w
ercase "us
a
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
lar
g
it-svn:
use a lowerca
s
e "usa
g
e:"
s
tr
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-sh
-
setup:
us
e
a lowerca
s
e
"usa
g
e:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Davi
d
Aguilar
t7800: "defaults" is n
o
longer a b
u
ilti
n
t
ool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
Aguilar
t7800:
m
odernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Dav
i
d Agu
i
l
a
r
t
780
0
:
update copyrig
h
t notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Da
v
id
A
guil
a
r
d
i
fftool: silence uniniti
a
lized variable w
a
rning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Agui
l
ar
p
4
m
e
r
ge:
fix
pr
i
ntf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguilar
difftool--helper: fix
printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid A
g
uilar
doc: generat
e
a list of valid mer
g
e tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid
Aguilar
mer
g
etoo
l
--lib: add functions f
o
r finding av
a
ila
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--l
i
b: improve the h
e
lp text
i
n
guess_
m
erge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib: simplify command e
x
p
r
essions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avi
d
Aguilar
mergetools: s
i
mplify how we h
a
n
dle "vim" and "def
a
u
lts"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
m
e
rgetool--l
i
b: improv
e
sh
o
w
_
to
o
l_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
merg
e
tools/vi
m
: r
e
move redundant
d
iff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Ag
u
ilar
mergetools/p
4
m
e
rge: Hono
r
$
T
MPDIR for
t
he /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
m
e
rgetools/p4mer
g
e
: Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David
A
guilar
mergetool--lib: Allow
custom com
m
a
nds to over
r
ide built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
Aguilar
gitk: Rename 't
a
gcontents' to 'cached_tag
c
ontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguil
a
r
g
i
tk
:
Teach "Rere
a
d references" to
r
elo
a
d tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d A
g
uilar
merg
e
tool,difftoo
l
: Documen
t
--
t
ool-help consis
t
ently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
difftool:
Disable --symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid
A
gu
i
lar
difftool: Handle compare() return
i
ng -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
d
i
f
ftool: Wr
a
p l
o
ng lin
e
s for re
a
dabili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid Aguil
a
r
difftool: Check all ret
u
rn codes from
c
ompare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avi
d
Aguilar
difftool: Handle
find
i
n
g
m
ergetools/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
d
ifftool: Us
e
s
y
mlinks when di
f
f
ing against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
A
gui
l
ar
diff
t
ool: Call the
temp directory "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Mo
v
e option
values into a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
gu
i
l
a
r
diffto
o
l: E
l
iminate
glob
a
l var
i
ables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
f
f
tool
:
S
imp
l
i
f
y print
_
tool_help(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
A
g
u
il
a
r
t7800: Test difftool passi
n
g arg
u
ment
s
to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mer
g
et
o
ol
:
Provide an emp
t
y file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
a
vid
A
g
uilar
M
a
k
e
file:
Impr
o
v
e compiler h
e
ader dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools/meld: Use '--output' w
h
e
n
available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid
Aguilar
mergetool
-
-
l
i
b:
R
efact
o
r tools int
o
separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid A
g
uilar
mergetool--lib:
M
ak
e
s
t
yle
c
onsistent with
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
d
i
fftool--
h
elper: Ma
k
e
s
tyl
e
c
ons
i
stent with
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David
Aguilar
t/t7503-pr
e
-
c
o
mmit
-
hook
.
sh:
A
d
d GIT_PRE
F
I
X test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
git-mergeto
o
l--
l
i
b
:
M
ake
v
imdiff
reta
i
n
t
he current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
git: Remove handling for
G
IT_PRE
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
l
a
r
setup: Pro
v
ide GIT_PREFI
X
to bui
l
t-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next