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
config: use utf8_bom[] from utf.[ch] in git_parse_source()
2014-11-14
David Aguilar
d
ifftool: honor --trust-exit-code f
o
r builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
D
a
vid
A
guilar
difftoo
l
: add support for --
t
rust-exit
-
code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
av
i
d Aguilar
t7610-mergetool: add test cases
fo
r
mergetool
.
w
r
i
t
e
T
oTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
mergetool
:
add an
opt
i
on for writing to
a
tem
p
orary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
i
d Aguilar
mergetool: use mo
r
e co
n
servative temporary filenam
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
gui
l
a
r
t
e
st-lib-fun
c
ti
o
ns
:
adju
s
t style to ma
t
ch CodingG
u
i
del
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
ar
t7610-mer
g
et
o
ol: use test_con
f
ig
t
o
isol
a
t
e
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetools/meld: mak
e
usage of `--output` conf
i
gurabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Agu
i
lar
git-sh-setup: move GI
T
_DI
R
ini
t
ializat
i
on in
t
o a
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid
Aguilar
mergetool: use more conserva
t
ive temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-lib-functions: adjust s
t
yle to match CodingG
u
idelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguil
a
r
t76
1
0-m
e
rgetool: prefer tes
t
_
c
o
nfig
o
ver git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool: add missing
&
& and remove com
m
ente
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
t
7
6
10-mergetool: use t
a
b
s
instead of a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
com
p
let
i
o
n
: add --sh
o
w-signature for
l
og a
n
d show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
a
vid Aguil
a
r
stash: prefer --qui
e
t over shell redirection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Agu
i
lar
r
efs: make re
v
-parse --quiet actually q
u
iet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t15
0
3: use test_must
_
be_em
p
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d Aguila
r
Documentation: a
n
ote
a
bout stdout for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Da
v
id Aguilar
cleanups
:
e
nsure that
git
-
compat-u
t
il
.
h
is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
style
f
ix: asterisks st
i
ck to the va
r
iable,
n
ot the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Dav
i
d
Agu
i
l
ar
gitk: Catch
mkdt
e
mp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id
A
guilar
gitk
:
Use mktemp -d to avoid predi
c
table temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
git
k
: Honor TMP
D
IR
w
h
en viewing extern
a
l diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David
Aguilar
difftool: s
u
pport r
e
positories with
.
git-
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Agui
l
ar
pull:
add --ff
-
only to t
h
e help t
e
xt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Agu
i
l
a
r
pull:
add pull
.
ff
c
onfiguration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vi
d
Ag
u
ilar
imap-send: e
l
imi
n
ate H
M
AC deprecati
o
n
wa
r
nings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid
Aguilar
cac
h
e
.
h: elim
i
n
a
te
S
HA-1 de
p
recat
i
on w
a
rni
n
gs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
v
i
d A
g
uilar
Makefile: add support for Ap
p
le CommonCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguila
r
Mak
e
fi
l
e: fix default
regex
settings
o
n Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David
Aguilar
merge
t
ools/kdiff3: do no
t
u
se --au
t
o when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Agui
l
ar
help
.
c: add
a
compati
b
ility comment
t
o cm
d
_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d A
g
uilar
contrib/
m
w-to-git/t/install
-
wiki
.
s
h
:
use
a
l
o
wercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid A
g
uila
r
contrib/exampl
e
s/git-remote
.
perl: use
a
l
o
w
e
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid
Aguila
r
tests: use a lowercase "usa
g
e:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id Aguilar
gi
t
-svn: use a lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguila
r
Documentation
/
user
-
manual
.
txt: use a lowercase "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Ag
u
ilar
templa
t
es/hooks--update
.
sam
p
le: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/hooks/setgitperms
.
perl:
u
se a lowercase
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
cont
r
ib/e
x
amples: us
e
a lowercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agu
i
lar
con
t
rib/
f
ast-import/import-zips
.
py:
u
se spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contrib/fa
s
t-import
/
impor
t
-zips
.
py: fix b
r
o
k
en e
r
ror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
cont
r
ib/fa
s
t-
i
mport: use
a
lowercase "usage:
"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contrib/c
r
edenti
a
l:
use
a
l
o
werca
s
e
"
us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-cvsim
p
or
t
: u
s
e a
l
owercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvs
i
m
p
ort: us
e
a lowercase
"
usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
ui
l
ar
git-cvsexportc
o
m
mit: use a lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git
-
archimport: use a lo
w
erca
s
e
"
u
sage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agui
l
ar
g
i
t
-merge-one-file: use a l
o
wer
c
ase
"
u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
g
it-relink: use a lowercas
e
"usage:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gu
i
lar
git-
s
v
n
: use
a
lowercase
"usa
g
e:"
str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguil
a
r
g
i
t-sh-
s
etu
p
: use a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Aguilar
t78
0
0: "defaults" i
s
no longer a
builtin tool
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid Aguilar
t
7
800: moderni
z
e test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t78
0
0: update copy
r
i
g
ht
notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
a
vi
d
Aguilar
difftool
:
sile
n
c
e uni
n
i
tialized variable warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
d
ifftool--help
e
r: fix pri
n
t
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
d
o
c: gener
a
te a
l
i
st of v
a
lid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vi
d
A
guilar
merge
t
ool--lib: add
functions for fi
n
ding availa
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
merg
e
too
l
--lib: improve
t
he help
t
e
xt in guess_merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
rgetool--l
i
b:
s
imp
l
i
f
y
command expr
e
s
s
i
o
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
i
d
Aguilar
mergetools:
s
implify how
w
e h
a
ndle "vim"
and "defau
l
t
s
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id A
g
ui
l
a
r
mergetool--lib: im
p
rove show_to
o
l_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/vim: remove
r
edundant di
f
f command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Agu
i
lar
m
e
rge
t
ools
/
p4merge: Honor $
T
M
P
D
IR for the /d
e
v/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
v
id Aguilar
m
ergetools/p4mer
g
e
:
Handle
"
/
d
e
v/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d A
g
uilar
m
e
rgetool--lib: Allow custom commands
to overrid
e
b
uilt-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
uilar
gitk: R
e
name
'
tagcontents' t
o
'cached_tagcontent
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Agui
l
ar
g
i
tk: Teach
"Rerea
d
r
e
fe
r
en
c
es" t
o
reload
t
ags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d Aguilar
m
e
rgetool,difftoo
l
: Document --tool-hel
p
consisten
t
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
diff
t
ool: Disab
l
e --sy
m
links on c
y
gw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Agui
l
ar
difftool: Handl
e
compare(
)
returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
difftool: Wr
a
p long lines for readabi
l
it
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
difftool: Check
a
ll return codes from comp
a
re()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
difftool: Ha
n
dle finding mergetools/ in a
p
ath with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
difftool: Use sy
m
l
i
nks when diffing a
g
ainst
t
h
e
wo
r
ktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difft
o
o
l: Ca
l
l the temp dire
c
to
r
y "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
d
i
fftool
:
Move
option values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d
Ag
u
ilar
difftool: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftool: Simplify p
r
int_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t78
0
0:
T
est difft
o
ol
p
assing
a
rgumen
t
s to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool: Provide an empty
f
i
le wh
e
n needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Improve com
p
iler hea
d
er dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d Aguil
a
r
me
r
getools/meld:
Use '--output' when
a
vailab
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
merge
t
o
o
l-
-
lib: Ref
a
ctor tools into separate
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: M
a
ke style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
d
i
fftool
-
-hel
p
er: Make style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t
/
t
7
503-pre-commit-ho
o
k
.
s
h
:
Add GIT_P
R
EFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
git
-
merg
e
too
l
-
-lib:
M
ake vimd
i
f
f
retai
n
t
h
e current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguila
r
git
:
Remove
handlin
g
f
o
r GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
setup:
Provide GIT_PREFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
Aguilar
sub
m
odule syn
c
: Update
"
sub
m
odule
.
<n
a
me>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Da
v
id
A
guilar
m
ergeto
o
l:
S
kip autore
s
olv
e
d paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Aguilar
Documentatio
n
: Expla
i
n gi
t
-mergetool's use of tem
p
or
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Aguilar
M
ake
f
i
l
e: Remov
e
usag
e
of de
p
recated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Aguilar
difftool:
Fix '--g
u
i' when diff
.
guitool
i
s u
n
configured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
v
i
d Aguilar
t7800-dif
f
tool
.
s
h: Te
s
t me
r
getool
.
p
ro
m
pt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid Agu
i
lar
difftool: Update copyright notices to list e
a
c
h y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next