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
setup_git_directory: delay core.bare/core.worktree errors
2014-11-14
Da
v
id Aguila
r
difftool: honor --trust-exit-code for builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
d
ifft
o
ol: add
s
upport for --tr
u
st-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetoo
l
: a
d
d test cases for
m
ergetool
.
wr
i
t
eToTe
m
p
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool: ad
d
a
n option for wr
i
ting to a tempor
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Agu
i
lar
me
r
getoo
l
:
use
m
ore
conservative tem
p
orary filen
a
mes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id
Aguilar
t
e
st-
l
ib-fu
n
ct
i
ons: adjus
t
s
t
yle to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Ag
u
ilar
t7
6
10-merge
t
oo
l
: us
e
t
e
st_config to is
o
late tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
i
l
ar
mergetools/meld
:
make
usage of `-
-
output` configurab
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agui
l
a
r
git-sh-
s
et
u
p: m
o
ve
GIT_DIR initializ
a
tion into
a
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
mergetool:
u
se more c
o
nservative
temporary filena
m
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
test-lib-fu
n
ctions: adjust style to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
t7610-mergetool: prefer test_config over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid A
g
ui
l
ar
t7610-merget
o
ol: add missing &
&
and remove
c
omme
n
ted
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
t76
1
0-merget
o
o
l
:
use tabs instead of a mix
o
f ta
b
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David
Ag
u
i
lar
com
p
letion: add --show
-
signature for log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David A
g
u
il
a
r
st
a
sh: p
r
e
f
e
r --quiet over s
h
ell re
d
ire
c
tion of
t
he
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Ag
u
ilar
r
e
f
s
:
m
ake
rev
-
parse --qui
e
t actually quie
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503: use test_m
u
s
t
_
b
e_
e
mpt
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Documentation: a note a
b
out stdout for
git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
Aguilar
cleanups: ensur
e
th
a
t
git-comp
a
t-util
.
h
i
s
included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
D
avid Aguilar
stylefix: asterisks stick
to t
h
e
vari
a
ble, not th
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Dav
i
d
Aguilar
g
itk: Catch mkdt
e
mp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Davi
d
Aguila
r
gitk:
U
se
mktemp -d
to avoid predictab
l
e temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id Agui
l
ar
g
i
tk: Honor TMPDIR when viewing ex
t
ernal diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
difftoo
l
:
s
upport repositories wit
h
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
id A
g
u
ilar
pull: add --ff
-
only
to th
e
help
t
e
xt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
i
d Aguilar
pull
:
add pull
.
f
f
configurati
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Da
v
i
d
Aguilar
imap-send
:
e
liminate HMA
C
depreca
t
ion
w
arnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Agui
l
ar
cache
.
h:
e
l
i
minate SH
A
-1 deprecation warnings on
M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
M
a
ke
f
ile: add
s
upport
f
or Apple CommonCry
p
t
o facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
avid Aguil
a
r
Ma
k
efile
:
fix d
e
faul
t
reg
e
x
s
et
t
i
ngs
on D
a
rwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David A
g
uilar
mergetools/kdiff3:
do not use --auto
when diffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
h
elp
.
c
:
add a compatibili
t
y comment to
c
md_
v
e
rs
i
on()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
cont
r
ib/mw
-
to-git/t/i
n
stall-w
i
ki
.
sh: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/examples/git-remote
.
perl: us
e
a lowerc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
i
d
Agu
i
lar
tests: u
s
e a lowercase "u
s
age:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
av
i
d Aguilar
git-svn: use a lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
D
ocumentation/use
r
-manual
.
txt: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
t
e
mpla
t
es/hook
s
--update
.
sa
m
ple: use a lowercase "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/hooks/
s
etgitpe
r
ms
.
perl: u
s
e
a
lowerc
a
se "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Aguila
r
co
n
trib/examples: use a l
o
w
e
rcase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguil
a
r
con
t
rib/fast-import/import-zips
.
py:
use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
c
o
ntrib/fast-
i
mport/i
m
port-zips
.
py: fix bro
k
en error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
cont
r
ib/fast-import:
u
s
e a lowerc
a
se "usage:" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/credential
:
use
a lowercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimpor
t
:
use a l
o
wercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-
c
vs
i
m
por
t
: use a l
o
wercase "usa
g
e
:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
A
guilar
git-
c
vsexportcommit: use a lowercase "usage:" st
r
in
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
g
i
t-archimport: use
a
lo
w
er
c
as
e
"usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-mer
g
e-
o
ne-file: u
s
e a l
o
werca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
ar
git-rel
i
nk: use
a
lowercase "usa
g
e
:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-s
v
n
: use a lowercase
"
u
s
age:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguilar
git-
s
h-s
e
tup: use a
l
o
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Aguilar
t7800:
"
d
e
f
a
ults" is no longer a builtin
t
ool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t
7
800: modern
i
z
e
te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David A
g
u
i
l
ar
t7800: upd
a
te copyr
i
ght noti
c
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
a
vid Aguila
r
di
f
ftool:
silenc
e
unin
i
tial
i
zed variabl
e
war
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d
A
guilar
p
4
merge:
fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
ui
l
ar
diff
t
ool--help
e
r:
fix
p
rin
t
f
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguil
a
r
doc: g
e
nerate a list of
v
alid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
il
a
r
mergetoo
l
--lib: add fun
c
tions for finding
a
v
ailable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool-
-
l
i
b
:
i
mpr
o
ve t
h
e
help t
e
xt
in guess_merge_tool(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib: s
i
mplify
c
om
m
and exp
r
ess
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Aguilar
mergetools
:
simplif
y
h
o
w
w
e handle
"vi
m
" and "
d
efaults
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avi
d
A
guilar
mergetool
-
-lib: i
m
pr
o
ve
s
how_tool_help(
)
o
u
t
p
ut
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid
Aguilar
m
ergetools
/
vim: remove
r
edundant
di
f
f com
m
and
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Aguilar
merge
t
ools/p4mer
g
e
:
Honor $TMPD
I
R fo
r
t
he /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mergetools/p4merge:
H
andle "/dev/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
merg
e
tool--lib: Allow custom co
m
mands to over
r
i
d
e built
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Re
n
ame 'tagcontents' to
'cached
_
tag
c
on
t
ent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
v
i
d Agu
i
l
a
r
gitk: Tea
c
h "Rere
a
d
references
"
to reload
t
ag
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David
A
g
uilar
m
e
rgetool,di
f
ft
o
ol: D
o
cument --to
o
l-h
e
lp con
s
istent
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
i
d
A
guilar
di
f
f
t
o
o
l
: Disable --symlinks on cygw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
d
i
fftool: Han
d
le com
p
are() returnin
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
di
f
f
tool
:
W
ra
p
long
l
ines for readabilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
v
i
d Ag
u
ila
r
di
f
f
t
o
ol: Che
c
k all retur
n
cod
e
s from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agui
l
ar
d
i
f
ftool: Han
d
le findi
n
g mergetools/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
difftool: Use symlinks when diff
i
n
g against t
h
e worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
di
f
ftool: Call the tem
p
d
irectory "git-di
f
f
t
ool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Agu
i
lar
dif
f
tool: Move opti
o
n values into a
h
ash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d
Aguila
r
difftool
:
Elimi
n
a
te g
l
oba
l
var
i
a
b
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguila
r
difftool
:
Sim
p
l
i
fy p
r
i
n
t
_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Da
v
id Aguilar
t7800: Te
s
t difftool passing arguments to
d
iff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
m
e
rgetool: Pr
o
vide a
n
em
p
ty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
a
vid
A
guilar
Makefile: Improve compiler
he
a
d
e
r
d
ependency
c
hec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid
Aguilar
mergetool
s
/meld: Use '--output' when availabl
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Agui
l
ar
mergetool
-
-lib: Refa
c
tor
t
ools in
t
o separ
a
te files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merg
e
tool--li
b
: Mak
e
style con
s
istent w
i
th
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
a
r
d
ifft
o
ol--
h
elpe
r
: Make style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
id Aguila
r
t/t
7
5
03-
p
re-commit-hook
.
sh: Add GIT_PREF
I
X tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
gi
t
-merget
o
o
l
--lib: Make vim
d
iff re
t
a
in the curre
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
git: Rem
o
v
e
hand
l
ing f
o
r GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
id Agui
l
a
r
setup: Provi
d
e GI
T
_
P
REFIX to built-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync:
Upd
a
te "su
b
m
o
du
l
e
.
<
name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Da
v
id A
g
uilar
m
e
rget
o
ol:
S
kip autoresolved path
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documen
t
a
t
ion: Explain
git
-
mer
g
et
o
ol's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Agu
i
lar
Makefi
l
e: Remo
v
e u
s
age of deprecated
P
y
thon "ha
s
_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vi
d
Aguilar
d
i
ff
t
ool:
F
ix
'
--gui' when diff
.
gui
t
ool i
s
unco
n
figured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difftool
.
s
h
: Te
s
t mer
g
etool
.
prompt
fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguil
a
r
diffto
o
l: Updat
e
copyright
no
t
ices to l
i
st each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next