repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maint
2016-07-28
Dav
i
d Agu
i
lar
difftoo
l
: use Git::* function
s
inst
e
ad of passing arou
n
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
d
i
fftool: avoid $GIT
_
D
I
R and $GIT_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
subtr
e
e: fix "git s
u
btree spli
t
--rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Dav
i
d Ag
u
i
lar
t7900-subtree
.
sh: fi
x
quoti
n
g a
n
d
b
roken
&&
c
hai
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Ag
u
ilar
diff
t
ool
:
handle
unmerged files
in dir-dif
f
mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
diffto
o
l: initialize variab
l
es f
o
r readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Agu
i
lar
mergetool: h
o
n
o
r
tempfile confi
g
u
ration when resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
mergetool: supp
o
rt delet
e
/
delete confli
c
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Agui
l
ar
difftool: i
g
no
r
e symbolic link
s
in
u
se
_
wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David
Agui
l
ar
contrib/subtr
e
e: ignore log
.
date confi
g
u
ration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
me
r
getools: add
w
inmerge as a buil
t
in too
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Ag
u
ilar
m
e
rgetool--
l
ib: set
IFS
for d
i
fftoo
l
and mergetoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
m
e
rgetools: stop setting
$status in merge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
Aguila
r
mergetool: s
i
mplify conditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
d
ifftool--
h
elper: add explicit exit stat
e
m
en
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d
Aguilar
m
e
rgetool--li
b
: rem
o
ve use
o
f $st
a
tus
global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
D
av
i
d Aguilar
difftool: hono
r
--tr
u
st-exit-cod
e
for
b
uil
t
in
t
ools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguil
a
r
difftool:
a
dd sup
p
or
t
for
-
-tr
u
st-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
t7610-me
r
getoo
l
: add
test cases
for mergetool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
merge
t
ool: add
a
n
o
ption for writing to
a tempor
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id
A
g
u
ilar
mergetool: use more cons
e
rvative temporary filen
a
mes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
test-lib
-
func
t
ions
:
adjust s
t
yle to
m
atch
Cod
i
ngGu
i
delines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
g
u
ila
r
t7610-mergetool:
us
e
test
_
confi
g
to is
o
l
a
te te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id
A
guilar
mer
g
etool
s
/
m
eld
:
m
ake usage of
`
--output` co
n
figur
a
b
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-sh-se
t
up:
move
G
IT_DIR init
i
alization into a functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
mergetool: use more conser
v
ative temporary fi
l
e
names
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
t
est-lib-funct
i
ons: adjust style to
matc
h
CodingGui
d
el
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-m
e
r
g
etool
:
prefer test_config
o
ver g
i
t conf
i
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t7
6
10
-
merge
t
o
o
l: ad
d
missing && and remove c
o
mmented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7610-merg
e
t
o
ol: use tabs instead of a mix o
f
tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Da
v
id Aguila
r
completion:
add -
-
show-signature
f
o
r
lo
g
and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Agu
i
lar
stash: pref
e
r
-
-qu
i
e
t over
shell
redir
e
c
tio
n
of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
r
e
fs:
make rev-
p
arse --quiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David A
g
uilar
t150
3
: use test_must_be_e
m
p
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Ag
u
ilar
Doc
u
mentat
i
on: a note about
s
t
d
out for
g
it rev-p
a
rs
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
cleanups:
e
ns
u
re
that gi
t
-
c
ompat-
u
til
.
h i
s
in
c
luded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
D
av
i
d
Aguilar
s
t
y
lefix:
a
sterisks stick to the
v
ariable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David
A
guila
r
gitk
:
Catch mk
d
temp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid Aguilar
g
i
tk: Use
mktemp
-d to
avoid pre
d
ict
a
ble temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David A
g
u
ila
r
gitk
:
Honor
TMPDIR w
h
e
n
vi
e
w
i
n
g e
x
ternal dif
f
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Dav
i
d Agui
l
ar
diff
t
ool: supp
o
rt repositories wi
t
h
.
git-file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d
Agu
i
lar
pull: a
d
d --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
pul
l
:
a
dd pull
.
ff conf
i
gurati
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap
-
send
:
eli
m
i
nate H
M
A
C deprecation warnings o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
Agui
l
ar
cache
.
h:
e
liminate
S
HA-1 deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Aguilar
Makefile: add
support for App
l
e CommonCry
p
t
o
facilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
M
a
k
efil
e
:
fix
default regex set
t
i
ngs
o
n Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Davi
d
A
g
uilar
m
ergetools/kdiff3: do
not use --a
u
to
when diff
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
he
l
p
.
c: add a
co
m
patibili
t
y co
m
ment to
c
m
d_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
cont
r
ib/mw-to-git/t/ins
t
all
-
w
iki
.
sh: us
e
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
contrib/examples/git
-
rem
o
te
.
perl: use
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests: us
e
a low
e
rcase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
ar
git-s
v
n:
use a
l
ower
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
Documentation/us
e
r-manual
.
txt: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
te
m
p
l
at
e
s/hooks--updat
e
.
sample:
use a lo
w
ercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
Aguilar
c
o
ntri
b
/h
o
oks/setg
i
tperm
s
.
perl
:
use
a
l
owerc
a
s
e "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
co
n
trib/e
x
ample
s
: u
s
e a lowercase "
u
sage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
c
o
ntr
i
b/fast-import/import-z
i
ps
.
py: u
s
e spaces in
s
tead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguilar
c
on
t
rib/
f
ast-impor
t
/import-z
i
ps
.
py: fix broke
n
e
r
ror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/fa
s
t-import: us
e
a lowercas
e
"u
s
age:"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Aguilar
co
n
trib/credential
:
use a lowercase
"u
s
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
l
a
r
git-cvs
i
mport: us
e
a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-cvs
i
mport: use a lowercase
"
us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
gi
t
-cvsexportcommit
:
u
se a lowe
r
c
a
se "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
a
rchimport: use a lo
w
ercase
"
usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
guilar
git-merge-one-file: use a lowe
r
case
"usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguila
r
git-relin
k
: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-s
v
n:
u
se a
lo
w
ercase "us
a
ge:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh
-
s
e
tup:
u
se
a lower
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
A
g
u
ilar
t780
0
: "default
s
" is no longer a b
u
iltin t
o
ol name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
uilar
t7800: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguila
r
t7800:
u
pdate
copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: silence uniniti
a
lized variable warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix
p
ri
n
tf
u
s
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid
Aguil
a
r
difft
o
ol-
-
hel
p
er
:
fix pr
i
ntf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Agui
l
ar
doc: ge
n
e
rate
a
list
of
valid
merg
e
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
g
u
i
l
ar
mergetool--lib
:
add functions for findi
n
g
ava
i
lable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
merget
o
o
l
--lib: improve the help text in guess_me
r
ge_too
l
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
mer
g
etoo
l
--lib: simplify command express
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
m
e
rgetoo
l
s:
s
i
m
p
l
ify how
we handle "vim"
and "default
s
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
e
rgetool-
-
l
i
b
: improve show_tool_he
l
p() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agui
l
ar
m
e
r
g
etool
s
/vim: remove
re
d
un
d
ant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Da
v
id Ag
u
ilar
mer
g
et
o
o
l
s/p
4
merge: Hon
o
r $TMPDI
R
f
o
r the /d
e
v/n
u
ll
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
av
i
d Aguilar
mergetool
s
/p4merg
e
:
H
a
n
d
l
e
"/dev/
n
ull"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David
Agu
i
lar
mergetool--lib:
Allow custom com
m
ands to override
b
uilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id Aguilar
gi
t
k: Rename 'tagcontents' to
'cached_tagcont
e
nt'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
uilar
gitk: Tea
c
h "Reread references" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Agu
i
lar
me
r
ge
t
ool
,
difft
o
ol: Document --tool-h
e
lp co
n
s
i
stently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
l
a
r
difftool: Disable --symlin
k
s on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguil
a
r
d
i
fftool: Handle co
m
pare() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uila
r
di
f
fto
o
l: W
r
ap
l
ong lines for rea
d
ab
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
uilar
difftool: Check all return codes from compa
r
e(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
difftool:
Handl
e
finding
merget
o
ols/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
di
f
ftoo
l
: U
s
e symlinks when diff
i
ng against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
d
i
f
ftool: Call
t
he temp dir
e
ctory "git-diffto
o
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
diff
t
ool: Move o
p
t
i
on 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: Elim
i
na
t
e globa
l
variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
d
i
fftool
:
Simpli
f
y print_tool
_
he
l
p()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguil
a
r
t
7800: Test d
i
fftool pa
s
sing
a
rgumen
t
s to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguila
r
merget
o
ol: P
r
o
v
ide an empty fi
l
e
when neede
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next