repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
checkout: require worktree unconditionally
2014-11-14
David
A
guil
a
r
difftoo
l
: honor --tr
u
st-
e
xit-code for builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
diff
t
ool
:
a
dd
support
for --trust
-
exit-cod
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Ag
u
i
l
ar
t7610
-
mergetool:
a
dd t
e
s
t cases for mergetool
.
w
r
iteToTem
p
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guil
a
r
me
r
getool:
a
d
d an op
t
ion f
o
r writing to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
mer
g
etool: use more cons
e
rvat
i
ve temporary
filen
a
mes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Agu
i
lar
test-lib-
f
unctions: adjust styl
e
to match Coding
G
ui
d
elines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
t7610-mergetool: use test_config to is
o
late
t
es
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id
A
guilar
mergetools/meld:
m
ake usage of `--
o
utput`
c
o
nfigur
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
gi
t
-sh
-
setup: move
G
I
T
_DIR initialization
i
n
t
o a
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Ag
u
ilar
mergeto
o
l: use more
co
n
se
r
vative te
m
porary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
i
d Aguil
a
r
t
e
s
t-l
i
b
-
functio
n
s:
a
d
just
s
tyle to
match Coding
G
uideli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id
Aguil
a
r
t7610-mergetool: p
r
efer test
_
co
n
fig
over
git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Ag
u
ilar
t761
0
-merge
t
ool: a
d
d
missing && and remo
v
e commente
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
t7610-mergetool: use tabs
ins
t
ead of a mix of
tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David
A
gu
i
l
a
r
co
m
pletion:
a
d
d --sho
w
-
s
ign
a
tu
r
e for log
a
nd show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Dav
i
d Aguilar
stash: pr
e
fer
--quie
t
over shel
l
red
i
rection of
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs: ma
k
e rev-parse --quiet act
u
ally qu
i
et
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Da
v
id Agu
i
lar
t150
3
: use test
_
must_be_em
p
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
D
o
cumentat
i
on: a note about stdout
for git
rev-pa
r
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d Aguilar
cleanup
s
: ensure that git-comp
a
t-util
.
h i
s
i
n
cl
u
ded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Da
v
id Ag
u
ilar
s
t
yl
e
fix: asterisks st
i
ck to the variable, not t
h
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
av
i
d Aguilar
gitk
:
C
a
tch mkdtemp
errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
git
k
: Use
m
ktemp -d t
o
avoid pre
d
ictable
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
g
itk:
H
o
nor
T
M
P
DIR when
v
iewing external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
D
a
vid Agui
l
ar
difftool:
support rep
o
sitories w
i
t
h
.
git-
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguila
r
pull: add --ff-only to the
h
e
l
p text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Ag
u
il
a
r
pull: add pull
.
f
f
configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-se
n
d
:
elimin
a
te HMA
C
deprecation
w
arn
i
ngs on
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguil
a
r
cache
.
h: e
l
iminate SHA-1 de
p
recation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
av
i
d Ag
u
i
lar
M
akefile:
add su
p
port for
A
p
p
le CommonCrypt
o
fa
c
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Davi
d
Aguilar
Ma
k
ef
i
le: fix default reg
e
x settings o
n
Darwi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Da
v
id Aguilar
m
ergetools/k
d
iff3: do n
o
t use --auto w
h
en diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David A
g
uilar
he
l
p
.
c: add a compatibili
t
y
comment to cm
d
_versi
o
n()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
lar
co
n
trib/mw-to-
g
it/t/in
s
tall-wiki
.
sh: use
a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contr
i
b
/examples/git-remote
.
p
e
r
l
: u
s
e a low
e
rc
a
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uila
r
tests: use a
l
o
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
i
lar
git-svn: use a
l
owercase "usage:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguilar
Documentat
i
on/user-manual
.
t
x
t: use a lowe
r
case "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
t
emplates/
h
ooks--update
.
samp
l
e:
u
se a lower
c
a
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ilar
con
t
rib/hooks
/
setgitperms
.
perl: use a lowercase "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
con
t
rib/examples: use a
lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
ntrib/fast-import/
i
mp
o
rt-zi
p
s
.
py: u
s
e spa
c
es
instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
ib/f
a
st-import/impor
t
-zi
p
s
.
py:
fi
x
b
r
oke
n
er
r
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
cont
r
ib/fast-impor
t
: use
a
lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
la
r
contrib/credential: use a lo
w
ercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
g
i
t
-cvsim
p
ort: use a lower
c
ase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gui
l
ar
git-cv
s
imp
o
rt:
u
s
e a
low
e
rcase "u
s
age:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-cvse
x
portcommit:
use a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t
-archim
p
ort
:
use a l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Aguila
r
git-merge-one-file: use a lowercas
e
"usag
e
:"
s
tr
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
gi
t
-re
l
ink: use a lo
w
e
rc
a
se "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Ag
u
ilar
git-s
v
n: use a low
e
r
case
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-sh-setup: use a lower
c
ase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid Aguilar
t
7
800: "
d
ef
a
ults" is no l
o
nge
r
a
builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d
A
g
u
ilar
t7800:
m
odernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: upd
a
te
c
opyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Ag
u
ilar
difftool: silenc
e
u
n
ini
t
i
alized
v
ariable wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agu
i
lar
p4merge: fix printf
u
sag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
i
lar
difftool--helpe
r
:
fix printf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: generate
a
l
i
st of valid merge tool
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
merge
t
oo
l
--lib: add functions for finding
a
vaila
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
merg
e
tool--li
b
: im
p
rove the help
t
ext in guess_
m
erge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
me
r
g
etool--lib: simplify command expressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Ag
u
ilar
mergetools: simpl
i
fy
h
ow we handle "
v
im" and "defau
l
ts"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ilar
merg
e
tool
-
-lib: im
p
r
o
ve sho
w
_t
o
ol_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Agu
i
lar
mergetoo
l
s/vim: rem
o
ve redundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Aguilar
mergetools/p4
m
erge: Honor $
T
MPDIR for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Agu
i
lar
mer
g
etools/p4m
e
rge: Handle
"
/
d
e
v
/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David A
g
u
ilar
mergetool--l
i
b: Allow
c
ustom comm
a
nd
s
t
o overrid
e
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk:
Rename 'tag
c
ontent
s
' to
'
c
ach
e
d_tagcon
t
ent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id Aguilar
g
itk: Teach "
R
ere
a
d
r
ef
e
re
n
ces"
t
o reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
a
vid
A
guilar
mergetool,difftool: Docume
n
t --too
l
-help consist
e
ntly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vi
d
Agu
i
lar
dif
f
tool: Di
s
able --symlink
s
on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
diffto
o
l: Hand
l
e c
o
mpare
(
) returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
d
i
ff
t
ool: Wr
a
p long lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
Aguilar
di
f
ftool
:
Chec
k
all return codes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Ag
u
ilar
d
ifftool: Ha
n
dle
fi
n
ding mergeto
o
l
s/ i
n
a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
l
a
r
d
i
fftool:
U
s
e
symlinks when
d
iffing against
the w
o
rktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
gu
i
l
a
r
difftool:
Call the temp d
i
rectory "git
-
difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difftool:
Mov
e
op
t
ion
values in
t
o a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
di
f
ftool: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguil
a
r
difftool: Simplify print_too
l
_hel
p
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
avi
d
A
guilar
t780
0
: T
e
st difftool passing arguments t
o
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid Aguilar
me
r
geto
o
l: Provide a
n
empt
y
f
i
le when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Aguil
a
r
M
a
kefile:
Improve comp
i
ler header
depend
e
ncy c
h
e
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Agu
i
lar
mergetools/meld: U
s
e '
-
-output'
when avai
l
able
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
a
r
m
e
r
g
etool
-
-lib: Refactor tools
into separate f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
rgetoo
l
--l
i
b: Make
st
y
le con
s
istent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftoo
l
--
h
e
lper
:
Make style
consisten
t
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David
A
guilar
t/t7503-pre-commit-hook
.
sh
:
Add GIT_
P
REFIX
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git
-
mergetool--lib: Make vimdiff reta
i
n t
h
e current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Agu
i
lar
git:
R
emove
h
andlin
g
for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
setu
p
: Provide
G
IT
_
P
REFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync: Upda
t
e "submodule
.
<nam
e
>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
er
g
etoo
l
: Skip au
t
oresolved pa
t
hs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentat
i
on: Expl
a
in git-mergetool'
s
use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David
Aguilar
Makefi
l
e
:
Remove usage o
f
depreca
t
ed Python
"has
_
key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David A
g
uilar
d
i
fftool:
Fix '--gui' when diff
.
guitool is
u
nconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguila
r
t
7
800-difftool
.
sh: Test mer
g
etool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Dav
i
d
A
guil
a
r
difftool: Update
c
opy
r
ight
notices to list each
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next