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
refs.c: remove_empty_directories can take a strbuf
2015-07-23
D
a
v
id Aguilar
c
o
ntrib/subtre
e
: ign
o
re log
.
date c
o
nfiguration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Ag
u
ilar
mergetools: add
w
i
nmer
g
e as a buil
t
in tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David
Aguilar
mergetool--lib:
set IFS for diff
t
ool and
m
e
r
g
e
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
A
g
uila
r
m
ergetools: stop setting $status in merge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid
A
gu
i
l
ar
m
e
rget
o
ol: simplify conditi
o
nals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d
Aguilar
diff
t
ool--h
e
lper
:
add explicit
e
x
i
t stateme
n
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Agu
i
l
a
r
mergeto
o
l--lib: remove use of
$
sta
t
us gl
o
ba
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
D
avid Aguilar
difftool: h
o
n
o
r --
t
rust-exit
-
code for
builti
n
t
o
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
D
av
i
d Aguilar
diff
t
ool: add support for --trus
t
-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uil
a
r
t76
1
0-mergetoo
l
: add test cases
f
or
m
e
rg
e
t
ool
.
writeToT
e
mp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Agui
l
ar
mergetool
:
add
a
n option for writing to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
a
r
mergetool:
u
s
e
mo
r
e conse
r
vative temporary
fil
e
names
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
i
d A
g
uilar
test
-
lib-functions
:
adjust s
t
yle t
o
match CodingGuideli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t
7
610-m
e
rgetool: use t
e
st_config
t
o isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d A
g
uilar
mergetools/
m
eld: make
usage
o
f
`-
-
output`
conf
i
gurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
A
g
uilar
git-sh-s
e
tu
p
: move GIT_
D
IR
i
nit
i
ali
z
ation into
a funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
m
e
rgetoo
l
:
use mo
r
e cons
e
rvati
v
e tem
p
orary f
i
lenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
te
s
t-li
b
-fun
c
tions: a
d
j
ust style to match
CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
u
ilar
t7610-me
r
g
etool: prefer test_conf
i
g over g
i
t confi
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguila
r
t7610-merget
o
ol
:
add missing && and remove commente
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d
Agu
i
l
a
r
t
761
0
-mergetool: u
s
e
tabs instead of a mix
of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
D
avi
d
Aguilar
completion: add --show-signatu
r
e for
l
og and
show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
id A
g
uilar
stash:
prefer --
q
u
i
et ov
e
r
sh
e
ll
redirection
of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
a
vi
d
Agui
l
ar
refs
:
make rev-parse --quie
t
actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Da
v
id A
g
uilar
t1503: use t
e
st_
m
ust
_
be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Documentation:
a note
abo
u
t stdout for g
i
t rev-p
a
rse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d
A
gui
l
ar
clean
u
ps: ensure that git
-
compat-util
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
stylefix: asterisks stick to the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Da
v
id Aguil
a
r
gi
t
k: Catc
h
mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id
Aguilar
gi
t
k: Use
mk
t
emp -
d
to
a
v
oid pred
i
ct
a
bl
e
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Honor TM
P
D
I
R when
viewing
e
xterna
l
diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Da
v
id Aguilar
d
ifftool: support repositori
e
s wit
h
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
i
d
Ag
u
i
l
ar
pu
l
l
:
add --
f
f-only t
o
the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguil
a
r
pull: add pull
.
f
f
c
onfiguratio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Dav
i
d Ag
u
ilar
i
map-sen
d
: el
i
minate HMAC deprecation wa
r
nings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Aguilar
cache
.
h: elimi
n
ate
SHA-
1
deprecation warning
s
o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid Aguil
a
r
Makefile
:
add sup
p
ort fo
r
Apple Com
m
onCrypto
fac
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Davi
d
A
g
u
ilar
Makefile: fix default
regex settings on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Da
v
i
d Aguilar
m
e
r
get
o
ols/
k
diff3: do not use
-
-au
t
o when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vid A
g
u
ilar
h
elp
.
c: add a compatibility comment
t
o
cm
d
_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Ag
u
ilar
con
t
r
i
b/m
w
-
t
o
-
g
it/t/install-wiki
.
sh: u
s
e
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
i
l
ar
contrib/example
s
/
g
it-remote
.
perl:
use a
l
ow
e
rcas
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
ar
t
ests: use a lo
w
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
i
l
ar
git-svn
:
use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ilar
Do
c
umen
t
ation/user-manual
.
txt: use
a
l
owerc
a
se
"us
a
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
templa
t
es
/
h
o
oks--update
.
s
ample: use a l
o
w
erca
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/h
o
oks/set
g
itperms
.
p
erl:
use a lowercase
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
trib/examples: use a lowercase "usa
g
e
:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
contrib/fa
s
t-import/import-zips
.
py: use sp
a
ces ins
t
ead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/f
a
st-impor
t
/import-zips
.
py:
fix broken
err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-im
p
ort: use a l
o
werca
s
e "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
co
n
tri
b
/credential: use a
l
owerca
s
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsim
p
ort:
u
se a lowercase
"
us
a
g
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-cvsimport: use a low
e
r
c
ase "
u
sage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
git-c
v
sexpo
r
tc
o
mmit:
u
se a
l
o
w
erca
s
e
"
us
a
ge:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-arc
h
import: use
a lowercas
e
"usage:" s
t
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-merge-o
n
e-file: use a low
e
rcase "
u
sage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-
r
e
link
:
use
a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-svn: use a low
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-sh-setup:
u
se
a
lowercase "usag
e
:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
v
id
A
guilar
t
7
800: "
d
ef
a
ults" is no lon
g
er
a buil
t
i
n tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Ag
u
ilar
t7800: modern
i
z
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Davi
d
Aguilar
t7800: update copyright noti
c
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Ag
u
il
a
r
difftool:
silence uni
n
itialized v
a
r
ia
b
le
w
a
rning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguilar
p4me
r
ge: fi
x
printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguil
a
r
difftool
-
-helper: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc:
g
e
n
erat
e
a li
s
t
of
v
ali
d
merge t
o
ols
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib: ad
d
functions f
o
r fi
n
d
i
ng ava
i
lable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Agui
l
ar
mer
g
et
o
ol--lib:
improv
e
the
h
elp text in gue
s
s_merge_to
o
l()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguilar
mergetoo
l
--lib: simplify command expr
e
ss
i
o
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguil
a
r
m
e
rgetools
:
simplify
h
ow we ha
n
dle
"vim" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vi
d
A
g
uilar
mergetoo
l
--lib
:
improve show_
t
ool
_
help() ou
t
put
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agui
l
ar
mergetools/vim: r
e
move
re
d
undant
d
iff
comm
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Aguilar
mer
g
etools/p
4
merge: Honor $
T
M
P
DI
R
for the /
d
ev/n
u
ll
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David A
g
uilar
mergetools/p4merge: Handl
e
"/
d
ev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Da
v
id Aguilar
m
e
rg
e
tool--lib:
A
ll
o
w cu
s
t
om co
m
mand
s
to override built-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
gi
t
k:
Rename '
t
a
g
cont
e
n
t
s' to
'
c
ached_tag
c
ontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gi
t
k
:
Teach
"Rer
e
ad references" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguila
r
m
ergeto
o
l,difftool: Doc
u
ment
--too
l
-help consi
s
tently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
ifft
o
ol: Disable --symlinks on cygw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difft
o
ol:
H
andle com
p
a
r
e(
)
r
e
turning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguilar
d
i
fftool: Wrap
l
on
g
lines for
r
eadability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Aguilar
diffto
o
l: Check all return codes from co
m
par
e
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
g
u
ilar
difftool: Handle findi
n
g merget
o
ols/ i
n
a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
oo
l
: Use symlinks when diffing
a
gainst
t
he worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
l
a
r
d
if
f
too
l
: C
a
ll
t
h
e temp directory "git-difft
o
ol"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifft
o
ol: Mov
e
o
ption va
l
ues
into
a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id
A
guilar
d
i
fftool
:
E
li
m
inat
e
g
l
o
bal variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Ag
u
i
l
ar
di
f
ftool: Sim
p
l
i
fy
p
rint_tool_hel
p
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
A
guilar
t7800: Test difftool pas
s
ing ar
g
umen
t
s
to
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
me
r
geto
o
l: Provide
a
n empty file
w
h
en needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Aguilar
Makefile: Improve c
o
m
p
il
e
r
header dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mergetools/meld: Us
e
'--output' when av
a
ilable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Agui
l
ar
mergetool--lib: Refactor tool
s
into sepa
r
ate fil
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Agui
l
a
r
merge
t
ool--lib: M
a
k
e
styl
e
consist
e
nt with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
difftool
-
-
h
elper: Make style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David A
g
uilar
t/t7503-pre-commi
t
-
h
ook
.
s
h
: Add GI
T
_PREFI
X
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Agu
i
lar
git-merget
o
o
l--
l
ib
:
Make vimdiff retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
gi
t
: Remove handling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
setup: Prov
i
de GIT_PREFIX
to built-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next