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
remote-bzr: add support for shared repo
2013-04-16
D
avid Aguilar
h
e
l
p
.
c: add a compatibil
i
ty c
o
mmen
t
to
cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguil
a
r
contrib/mw-t
o
-git/t/ins
t
all-wiki
.
sh:
u
se a lower
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib
/
e
x
a
mple
s
/git
-
remote
.
perl: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Aguilar
tes
t
s: use a l
o
werc
a
s
e
"usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
git-svn: use a lowerca
s
e
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguila
r
Do
c
umentatio
n
/user-manual
.
tx
t
: use
a lowe
r
c
a
se
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
templates/hooks--update
.
sample:
use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/ho
o
ks/setgi
t
per
m
s
.
p
e
rl: u
s
e
a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/
e
x
a
mples: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agui
l
ar
contrib/fast-im
p
o
r
t/import-zips
.
py: use space
s
instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
c
o
ntr
i
b
/
fast-import/impo
r
t-z
i
p
s
.
py: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
c
o
n
t
r
ib/fast-import
:
use a
lowercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Aguilar
contrib
/
c
redentia
l
: use
a
l
o
werca
s
e "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimport
:
use a lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id A
g
uilar
git-c
v
simpo
r
t: us
e
a lowercas
e
"usage:" st
r
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
g
i
t-cvsexp
o
r
t
commit
:
use
a
lowe
r
case "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid A
g
ui
l
ar
git-ar
c
himport:
use a low
e
rcase "
u
s
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-mer
g
e-
o
ne-fi
l
e: use a
low
e
rcase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-rel
i
nk: use a l
o
we
r
case "us
a
ge:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-s
v
n: use a lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Aguilar
git-sh-setup: use a
l
owercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
A
guil
a
r
t7800: "defa
u
lts
"
i
s no
l
onger a builtin to
o
l name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Agu
i
l
ar
t78
0
0: mod
e
rn
i
z
e
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Ag
u
ilar
t7
8
00
:
u
p
date copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Davi
d
A
guilar
difftool: silen
c
e u
n
i
nitialized variab
l
e warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id Aguilar
p4merge: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agui
l
ar
difftool
-
-he
l
p
er:
f
ix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guil
a
r
do
c
:
ge
n
erate a list of
v
alid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Aguilar
m
ergetool--lib: add functions for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merge
t
ool--lib
:
improve the help text in guess_merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Ag
u
ila
r
mergetool--lib: simplify co
m
m
and exp
r
e
s
s
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetools: simplify how w
e
handle "vim" and "defaults
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id A
g
u
ilar
mergetool
-
-lib: improve
s
how_tool_help() ou
t
put
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id Agui
l
ar
merge
t
ools/vim:
r
em
o
v
e redundant diff
c
o
m
man
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David
Aguila
r
mergetool
s
/p4m
e
r
g
e
: Ho
n
o
r
$TM
P
DIR for t
h
e /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David
A
gu
i
l
a
r
mergetoo
l
s/p4merge: Handle
"
/dev/nul
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
avid Aguilar
mergetool--lib: Allow
c
ustom c
o
mmands to override built
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguilar
gi
t
k: R
e
n
ame 'tagcontents'
to 'c
a
ched_tagc
o
ntent
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gi
t
k: Teach "
R
er
e
ad
r
eferences" to reload
t
ag
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d Aguil
a
r
mergetool,di
f
f
t
ool: Document --tool-
h
e
l
p cons
i
s
tently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
id A
g
uilar
d
i
f
f
too
l
: Di
s
able --symlinks on
c
ygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
difftool: Handle compare() r
e
turning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
lar
diff
t
ool: Wr
a
p lon
g
li
n
es for readabi
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guilar
dif
f
tool: Che
c
k all re
t
u
r
n code
s
fr
o
m compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
ilar
difftool: Han
d
le findi
n
g mergetoo
l
s/ in a
p
ath with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d
Aguilar
difftool: Use
symlinks
when diffi
n
g ag
a
i
n
s
t the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
diffto
o
l: Call the temp dir
e
ct
o
ry "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool: Mo
v
e op
t
i
o
n values in
t
o a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
di
f
f
tool: E
l
iminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
di
f
f
t
ool: Si
m
plify prin
t
_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Agui
l
ar
t7800: T
e
st difftool passing
a
rgum
e
nts to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid
A
gu
i
l
ar
mergetool
:
Provide an e
m
p
ty file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David
Aguilar
Makefi
l
e: Improve compi
l
e
r
header dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d
Agu
i
lar
mergetool
s
/meld: Use '--output' wh
e
n
available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Agu
i
lar
m
erg
e
tool--
l
ib: Refactor tools into sepa
r
ate
f
i
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
mergetool--l
i
b
: Make st
y
le consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
diffto
o
l--hel
p
er:
Make style consistent w
i
th git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-p
r
e
-commit-hook
.
sh: Add GIT_PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
g
i
t-mergetool--lib: Make vimdiff retain
t
h
e current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
gi
t
: Remove handling
for GIT_PR
E
FIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Agu
i
lar
s
e
t
u
p: P
r
ovide GIT_PR
E
FIX to built
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid Aguil
a
r
s
u
b
modu
l
e sync: Update "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetoo
l
:
S
kip
autoresolve
d
paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d Aguilar
D
ocum
e
ntation: Explain
git-merg
e
tool's use of
t
em
p
orary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d Agu
i
lar
Makefile: Remo
v
e usage of de
p
r
e
cated Python "h
a
s_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
di
f
ftool: Fix '--
g
ui
'
when
diff
.
guito
o
l is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David
Aguilar
t7800-difftool
.
sh: Test merget
o
ol
.
prompt fallbac
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool:
U
pdate copyright
n
ot
i
ces to
list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
diffto
o
l: Use eval to exp
a
nd '--extcmd'
e
xpr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
difftool: Add '-x' and as an
a
l
i
as for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Ag
u
i
l
a
r
t7800-d
i
fftool
.
s
h
:
S
implify the --extcm
d
t
est
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguila
r
git-diff
.
txt:
L
ink to git-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
diff
t
ool
:
Allow s
p
ec
i
fying unconfigu
r
ed commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool
-
-helper
:
R
e
move use of
t
h
e GIT_M
E
R
G
E
_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--help
e
r: Update
copyri
g
ht
and remove distr
a
cting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
ar
git-
d
i
fftool: Add '--gu
i
' for select
i
ng a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Aguilar
t7
8
00-d
i
fftool: Set a bogus tool for use
b
y t
e
s
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguila
r
help
:
Do not
u
nne
c
essarily look for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id
Aguilar
submodule
.
c
:
Squ
e
lch
a "use b
e
fore assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
A
gu
i
lar
diff: generat
e
pre
t
ty f
i
lename
s
i
n pr
e
p_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
compat: add a basename() compatibili
t
y functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
c
o
mpat: ad
d
a mkstemps() c
o
m
patibility f
u
n
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
Add git-replace to
.
g
i
tigno
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguilar
me
r
getool--lib:
add support for
a
rax
i
s merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguila
r
mergetoo
l
--lib: specialize di
f
f
options f
o
r e
m
er
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
m
ergetool--
l
ib: simplify API
usage
b
y removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
diffto
o
l/mergetoo
l
: refactor com
m
ands to use
g
it-mergeto
o
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
mergetool: use $(
.
.
.
) in
s
tea
d
of `b
a
c
kticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
a
sh comp
l
eti
o
n: add git-diffto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool: add support f
o
r a difftool
.
promp
t
c
onfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
too
l
:
a
dd
v
a
rious git-difftool test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move 'git-dif
f
tool' out of contr
i
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add a
-
y
shortcut fo
r
--no-
p
rompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l
:
use perl
bu
i
lt-ins when testing
f
or msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: remove the backup fil
e
f
e
a
t
u
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: remove merge options for opendiff, tk
d
iff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
avid Aguila
r
everyday: use the dashless form
o
f
git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/difftool: use a separate co
n
f
i
g
n
ame
s
pac
e
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
con
t
rib/difftool: Don't repeat me
r
ge to
o
l candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
A
guilar
di
f
f
t
ool: put t
h
e cur
s
or o
n
the editable
file fo
r
V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next