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
cat-file: minor style fix in options list
2015-05-20
Davi
d
Aguilar
m
e
r
g
etools: ad
d
winmerge as a
b
uiltin
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David
Aguilar
mer
g
e
tool--lib: set IFS
for
d
ifftool and merg
e
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agui
l
ar
mergeto
o
l
s:
s
t
o
p setting $s
t
atus in merge_cm
d
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
guilar
mer
g
eto
o
l
: simplify co
n
ditiona
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguil
a
r
d
i
f
f
tool--helpe
r
:
add explicit exit
s
t
at
e
men
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool--l
i
b:
r
emove
u
se
o
f $
s
tatus
g
lobal
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Ag
u
ilar
difftool: honor --trust-exit-code
f
o
r builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
difftool:
a
dd
su
p
p
ort for --trus
t
-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
ar
t
7
610-me
r
getool:
add te
s
t
c
ases
for mergeto
o
l
.
wr
i
t
eToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
mergeto
o
l
:
add an option for writing t
o
a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
m
e
rgetool: use more conservative temp
o
rar
y
filenam
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
test-lib-func
t
ions: adjust
s
t
y
le t
o
m
a
t
ch CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
t
761
0
-mergetoo
l
: use test_con
f
ig to isolate tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
mergetool
s
/meld: m
a
ke usage of `--output` con
f
igurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
g
i
t-sh-setup: move
G
I
T_DIR
initializ
a
tion
in
t
o a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
m
e
rge
t
ool: use
more conservat
i
ve tempora
r
y filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
test
-
lib-function
s
: adjust style to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7
6
10-mergetool
:
prefer test_config over git
config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Aguilar
t
7610-mergetool: add miss
i
ng && and remove com
m
ent
e
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
t7610-mergeto
o
l: use tabs instead of a mix
of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
comp
l
etion
:
add --show-
s
ignature for log an
d
show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash: prefe
r
--quiet over shell redirec
t
ion
of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
avid Aguila
r
refs:
make rev-par
s
e --quiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Agu
i
lar
t1503: us
e
t
est_must_
b
e_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Agu
i
lar
Documenta
t
ion: a note about std
o
ut for git re
v
-p
a
rse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
c
leanups: en
s
ur
e
that git-compat-util
.
h
i
s included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Dav
i
d Aguilar
stylefi
x
:
a
sterisks stick to the variab
l
e, not th
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gi
t
k: C
a
tch mk
d
temp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Dav
i
d
Aguilar
g
i
tk: Use mk
t
em
p
-d
to avoid predic
t
a
b
le temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David A
g
uilar
gitk: Ho
n
o
r
T
MPDIR when viewing external
dif
f
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Davi
d
Aguilar
difftool: s
u
pport reposit
o
r
ies with
.
g
it-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Ag
u
ilar
pu
l
l: ad
d
--
f
f
-
only to the he
l
p text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
id Aguilar
pull
:
add pull
.
ff configu
r
ation
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Ag
u
i
l
ar
imap
-
se
n
d: eliminate HMAC depreca
t
ion warnings
on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Aguilar
cache
.
h: eliminate SHA-1 deprecatio
n
wa
r
nings o
n
M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David A
g
u
ilar
Makefil
e
: add suppo
r
t
f
or App
l
e Commo
n
C
rypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Ag
u
ilar
Mak
e
file:
fix
d
efault r
e
gex settings on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
m
e
rgetools/kd
i
f
f3: do n
o
t use --aut
o
w
h
en d
i
ffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
hel
p
.
c: add a
c
ompa
t
ibilit
y
com
m
ent to cmd_
v
ersion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
c
ontrib/mw-to-git/t/inst
a
ll-
w
iki
.
sh: use
a lowe
r
c
a
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Ag
u
i
l
ar
contrib
/
examples/git-remote
.
p
e
r
l: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Agu
i
lar
tests: use a low
e
rcase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguil
a
r
git-svn: use a lowercase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
D
o
c
umentat
i
on/user-m
a
nual
.
t
x
t:
use a lowercas
e
"us
a
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
te
m
p
l
a
tes/hooks--update
.
sample: use
a
lo
w
ercase "us
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Aguilar
c
ontrib/ho
o
ks
/
setgitperms
.
perl: use a lowe
r
case "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
ilar
contrib
/
examples: use
a
l
ower
c
ase "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/
f
a
st-impor
t
/import-zips
.
p
y
: use s
p
aces inst
e
ad
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Ag
u
ilar
contri
b
/
f
ast-i
m
port/impor
t
-z
i
ps
.
py: fix brok
e
n error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
c
ontrib/fast-import: use a
l
owercase "usage:"
st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/credential: u
s
e
a
low
e
r
c
ase
"u
s
ag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvs
i
mport: use a lowerc
a
se
"usage:"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
uilar
git-
c
vsi
m
port:
use a
l
o
wercase "
u
sage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsexportcommit: use a lowe
r
case "us
a
ge:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
g
i
t-ar
c
himp
o
rt: use
a lowercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-merge-one-fil
e
: u
s
e a lowercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relink: use
a
lowercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-svn: use a
lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguilar
git-
s
h
-
setup: us
e
a low
e
rcas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Ag
u
ilar
t7800: "defau
l
ts"
is no long
e
r a
builtin tool
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Aguilar
t78
0
0:
modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Agu
i
la
r
t7800
:
upda
t
e copy
r
ight notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
avi
d
Aguilar
difftool
:
silence u
n
i
n
itialized variable warnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Agui
l
ar
p4merge
:
fix pr
i
ntf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
A
guilar
dif
f
tool--he
l
p
e
r: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
d
o
c:
g
enerate a list of valid m
e
rge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
me
r
geto
o
l--l
i
b: add functions for finding
a
vailabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
A
gu
i
la
r
mergetool-
-
lib: i
m
prove the
help t
e
xt
i
n gues
s
_me
r
ge_t
o
ol()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agu
i
lar
merg
e
tool--lib: si
m
p
l
ify command expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Agu
i
l
a
r
merget
o
ols: s
i
mplify
ho
w
w
e
handle "vi
m
" and "
d
efault
s
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uilar
mer
g
etool--lib
:
impro
v
e
s
how
_
to
o
l_
h
elp(
)
output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/vi
m
:
remove redundant dif
f
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David
A
g
u
ilar
mer
g
etools/
p
4me
r
ge: Honor
$
TMPDIR for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
v
id Agui
l
ar
mergetools/p4m
e
rge: Handle "/d
e
v/null
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
merg
e
tool--lib: Allow custom commands to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
guilar
gi
t
k: R
e
name 'tagcontents' to 'ca
c
hed
_
ta
g
content
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: T
e
a
c
h "Rerea
d
refe
r
e
n
ces"
t
o
r
el
o
ad tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguila
r
me
r
g
e
tool,difftool: Document --to
o
l-he
l
p con
s
istently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
diff
t
ool:
D
isable --symlin
k
s on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
difftool: H
a
ndle
c
ompare(
)
returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
d
iff
t
ool: Wrap long l
i
nes
f
or readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Aguilar
difftool:
Check
a
ll return
codes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
d
ifftool: H
a
n
dle finding mergetools/ in a
p
ath with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
d
i
fftool: Use symlinks
when di
f
fing against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
dif
f
tool:
C
a
ll the temp di
r
ector
y
"git
-
difft
o
ol"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Move option values into a has
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
ool: E
l
imin
a
te glob
a
l variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
ool: Simplify pri
n
t_tool_he
l
p()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguila
r
t7800
:
Test difftool passing arguments to
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguil
a
r
mergetool: Provide an empty file whe
n
ne
e
ded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
a
v
i
d Aguilar
Makefile: Imp
r
ove
c
ompiler header dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d
Aguilar
merget
o
ols/meld: Use '--output' wh
e
n
available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
mergetool--l
i
b: Refactor tools
i
nto sep
a
r
at
e
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
Agu
i
lar
mergetool--lib
:
Make style co
n
sistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Agui
l
ar
difftool--
h
elper
:
Make style consistent with gi
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguila
r
t/t75
0
3-pre-commit-hook
.
sh: Add GI
T
_P
R
E
F
I
X tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
g
u
i
l
a
r
git-mergeto
o
l--li
b
: Make vimdiff retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
git
:
R
emov
e
han
d
ling for GIT_
P
REFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguila
r
setup: Provide GIT_PREFIX to built-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync: U
p
da
t
e "submodule
.
<name
>
.
u
r
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next