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-hg: enable track-branches in hg-git mode
2013-05-09
Dav
i
d Aguilar
mergetools/kd
i
ff
3
: do not use --auto w
h
en diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c:
ad
d
a
co
m
patibility co
m
m
e
nt to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguilar
c
o
ntr
i
b/mw-t
o
-git/t/in
s
t
a
l
l
-wiki
.
sh: u
s
e a lowe
r
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
co
n
tr
i
b/examples/git-remote
.
perl: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguila
r
tests: use
a
lowercase "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
lar
git-svn:
u
s
e a lowe
r
c
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
Document
a
tion/user-m
a
n
u
al
.
txt: use a lowercase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
templates/hooks--updat
e
.
s
a
mple: use a lowe
r
case
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
u
i
l
ar
contr
i
b/hooks/s
e
tgitperm
s
.
perl: use a lowercas
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
trib/e
x
amples: us
e
a lowercase "u
s
ag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
cont
r
ib/fast-import/import-zips
.
py:
use
s
paces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agu
i
la
r
contrib/fas
t
-import/import-
z
ips
.
py: fix br
o
ken err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/fast-
i
mp
o
rt: use a l
o
w
e
rcas
e
"usag
e
:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Agui
l
a
r
contr
i
b/
c
redent
i
al: use a lowerca
s
e "usage
:
" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-cv
s
impor
t
:
use a lowercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguila
r
git-cvsimport: use a
lowercase
"
us
a
ge:" s
t
ri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-c
v
sex
p
ortcommit: use
a
low
e
rcase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
ui
l
ar
git-archimp
o
rt: use a lowerc
a
se "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguilar
g
i
t
-merge-
o
n
e-file
:
use a lowerc
a
se
"usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
r
elink: use
a
lowerca
s
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a lo
w
ercase
"u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
gi
t
-sh-s
e
tu
p
: us
e
a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid Ag
u
i
l
ar
t7800: "defaults" is no long
e
r
a builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Ag
u
ilar
t7800:
m
oder
n
ize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Agu
i
lar
t
7
800: update
c
opyright
no
t
ic
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
d
ifft
o
ol: sile
n
ce uniniti
a
l
ized
v
ariable war
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguila
r
p
4m
e
rge
:
fix
printf
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agu
i
l
a
r
difftool--he
l
pe
r
:
f
i
x printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
doc: generate
a
lis
t
of
v
alid me
r
g
e t
o
ols
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d Aguilar
merg
e
t
ool--li
b
: add fun
c
t
i
ons for fi
n
ding avail
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
mergetool--lib: impro
v
e
the help text in
g
uess
_
me
r
g
e
_too
l
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
mergetool--l
i
b: simpl
i
fy comm
a
n
d exp
r
e
s
sions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Ag
u
ilar
mergetools: s
i
mpl
i
fy how we h
a
n
dle "vim"
a
nd "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id Aguilar
mergetool--lib: improve
sh
o
w_tool_he
l
p(
)
output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
v
i
d Aguilar
m
ergetools/vim: remove redundant di
f
f co
m
ma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
m
erg
e
tools/p4merge
:
Honor $TMP
D
IR for th
e
/dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David
A
g
uilar
m
ergeto
o
ls/
p
4mer
g
e: Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
a
vid Aguilar
m
e
r
ge
t
ool--lib
:
Allow cus
t
om comma
n
ds to overrid
e
b
u
ilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d
Aguilar
gitk: Rename 'tagcontents' to 'ca
c
h
ed_tagc
o
nte
n
t'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Aguilar
gitk: T
e
ach "Re
r
ead ref
e
rences" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergeto
o
l
,
di
f
f
tool: Docume
n
t --
t
ool-help consistentl
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguila
r
difftool: Disable
--sym
l
inks
on
c
ygw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Handle compare() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
ffto
o
l: Wrap long lines for re
a
dab
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguila
r
difftool
:
Check all retu
r
n co
d
es from c
o
mpare
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid
A
gui
l
ar
difftool: Handle fi
n
ding mergetoo
l
s
/
in a path wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
i
lar
difftool: Use symlink
s
when diffing
a
gains
t
the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
d
ifftool: Call the
te
m
p
d
i
rectory "git-difftool
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid A
g
uilar
dif
f
tool: Move option
values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avi
d
Aguilar
difftool: Elimi
n
a
t
e
global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: S
i
mpl
i
fy print_tool
_
help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David A
g
uilar
t78
0
0
:
T
e
st
d
ifftool pa
s
sing argu
m
ents to
d
i
ff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Agu
i
lar
mergetool: Prov
i
de an empty
fi
l
e when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Improve com
p
iler header dep
e
ndency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
gui
l
ar
mergeto
o
ls/mel
d
: U
s
e '--output' w
h
en available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
v
i
d
Aguilar
mergetool--l
i
b: Refa
c
t
o
r t
o
ols
into separate fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
me
r
ge
t
ool-
-
lib: Make
s
t
yle co
n
sistent
with
g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguil
a
r
difftool--hel
p
e
r
:
M
a
k
e style
c
onsistent with
g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Davi
d
A
g
uilar
t
/
t
7503-pre-commit-hook
.
sh: Add GIT_PREFIX t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
git-mergetool
-
-lib: Make vi
m
diff retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
g
u
il
a
r
git: Remove
hand
l
in
g
for G
I
T_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: P
r
ovide GI
T
_PR
E
FIX
t
o bui
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Agu
i
la
r
submodule sync:
U
pdate "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d Aguilar
mergetool: Skip auto
r
es
o
lved
p
a
ths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Aguila
r
Documen
t
ation: Explain git-mergetool's use of te
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Agui
l
a
r
Makefile: Remove u
s
a
ge of de
p
recated Python "
h
as_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Agu
i
lar
difftool: Fix '--gui' when d
i
ff
.
guitoo
l
i
s
unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-dif
f
tool
.
sh: Test mergetool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
uilar
difft
o
o
l
: Upd
a
te
copyr
i
ght
notices to list
e
a
ch yea
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
difftool: Use eval to ex
p
and '--extc
m
d' expre
s
sions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Add '-x'
and as an alias f
o
r '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
u
ilar
t7
8
00-diff
t
ool
.
s
h:
S
implify t
h
e --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id
A
guilar
gi
t
-diff
.
txt: Link to
gi
t
-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difftool:
A
llow specifying unconfigure
d
com
m
a
n
ds w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguila
r
difftoo
l
--helper: Remove use of the GIT_M
E
RGE_T
O
O
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
d
i
fftool--helper: U
p
da
t
e copyright and
r
emove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
git-difftool: Add '--g
u
i' f
o
r select
i
ng a
GUI
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t
7
800-
d
i
f
ft
o
o
l: Set a bogus tool for
u
s
e by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Ag
u
ilar
help:
D
o not unnece
s
s
a
r
i
ly l
o
ok for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David
A
guilar
s
u
bmodule
.
c: S
q
u
e
lc
h
a "use before assignment"
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
diff: ge
n
erate
p
retty filenames in prep_t
e
m
p
_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d Aguilar
compat: a
d
d
a
ba
s
ename() compatibility functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
c
ompat: add a mkstemps() compa
t
ibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguil
a
r
A
dd
g
i
t-repla
c
e to
.
git
i
gnore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David
Aguilar
mergetool
-
-li
b
: add support for araxis
m
er
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id
A
guilar
m
e
rgetool--lib: specialize d
i
ff options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid
A
guilar
mergetool-
-
lib: sim
p
lify API usage
by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
i
lar
difftool/merg
e
tool:
r
efac
t
or commands to use git-mer
g
etool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
me
r
getool: use
$(
.
.
.
) instead of `back
t
icks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
b
a
sh completion: add
git-di
f
ftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: add
support f
o
r a difftool
.
promp
t
config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
ftool: add various
g
it-difftool te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
a
r
d
ifftoo
l
: move
'git-difft
o
o
l' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
Aguilar
dif
f
tool: add a
-y shor
t
cut
f
or --no-p
r
ompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: use perl built-ins when te
s
ting
for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove t
h
e backup
f
ile f
e
a
t
u
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove m
e
rge
option
s
fo
r
ope
n
diff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David
A
guilar
e
ve
r
y
d
ay: use th
e
dashless form
of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David A
g
u
i
l
ar
con
t
r
i
b/difftool: use a separ
a
t
e config n
a
mespac
e
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d
A
guilar
contrib/
d
ifftool: Don't
r
e
p
e
a
t
merge tool candi
d
ates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next