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
Git 1.8.0-rc1
2012-09-25
David Aguilar
merge
t
oo
l
--li
b
: Al
l
ow custom commands to ov
e
r
ride built-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
g
i
tk: Rena
m
e 'tagcontents' to
'c
a
che
d
_tagc
o
nten
t
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk:
Teach "Reread r
e
f
erences"
t
o
r
eload
t
ags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David
Aguilar
mergetool,di
f
f
tool: Document --too
l
-
h
elp
co
n
sist
e
n
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disable --symlink
s
on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difftool: H
a
ndle compare() returni
n
g -
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
d
ifftool: Wrap long l
i
nes for readabi
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Check
a
ll return
c
od
e
s fr
o
m compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
difftool: Handle f
i
nding
m
ergetools/ in
a
path w
i
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
diff
t
ool: Use
s
yml
i
n
k
s when di
f
fing against the wor
k
tr
e
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
difftool: Call the temp directory "gi
t
-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
d
ifftool
:
Move option val
u
es in
t
o a has
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftool: Eli
m
inate
global
v
ariables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uil
a
r
d
i
f
f
tool: Simplify print_tool_he
l
p()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Da
v
i
d Aguilar
t7800: Test difftool passing
a
rguments to d
i
ff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
me
r
getool: Provide an empty file when
n
eeded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Ag
u
ilar
M
a
kefil
e
: Improve comp
i
ler h
e
ad
e
r dep
e
nd
e
ncy chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
merge
t
ools/meld: Use
'
--
o
utpu
t
'
when
a
v
ailable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
merge
t
ool--lib: Refa
c
tor t
o
ols into separ
a
te f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
merg
e
tool--
l
ib: Make style con
s
istent
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
gui
l
ar
difftool--helper: Make style consisten
t
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d
Agui
l
ar
t/t7503-pre-commit-hook
.
sh
:
Add GIT_PREFIX
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
i
d
A
guila
r
git-merg
e
tool--lib:
M
ake vimdiff
retain the
current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove handling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avi
d
Aguilar
setup:
Provid
e
GIT_PREFIX to built
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
s
u
b
m
odule s
y
nc: Update "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d Aguila
r
mergetool:
S
kip
autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Agui
l
ar
Docum
e
nta
t
ion:
Ex
p
lain
g
it-mergetool's use of t
e
mporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
avid Aguilar
Makefile:
R
emove usa
g
e of deprec
a
ted
P
ython
"has_ke
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difft
o
o
l
:
F
ix '-
-
gui' when diff
.
g
uit
o
ol is
u
n
configured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
av
i
d Aguil
a
r
t7
8
00-diffto
o
l
.
sh:
T
est mergetoo
l
.
prom
p
t
fallbac
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool:
U
p
dat
e
copyright notices
t
o li
s
t eac
h
y
ear
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avi
d
Aguilar
diffto
o
l: Use eval to expand '--extcmd
'
e
x
press
i
o
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
difftool
:
Add '-x'
and as a
n
alias for
'
--extcmd
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
i
d
A
g
u
ilar
t7800-d
i
fft
o
ol
.
s
h
:
Simp
l
if
y
t
h
e --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
g
u
ilar
git-diff
.
txt: Li
n
k
t
o git-
d
ifft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id Aguilar
d
i
fftool: Allo
w
speci
f
yi
n
g unco
n
figur
e
d comman
d
s
w
ith
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
A
g
uilar
difftool--hel
p
er: Remove
use of the
GIT_MERGE_
T
O
O
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guila
r
difftool--helper
:
U
p
date copyright and remov
e
distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
il
a
r
g
it-difftool: Add '--gui' for selecting a GUI
too
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
g
u
i
l
ar
t7800-difftool: Se
t
a
bogus tool
f
or use by te
s
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not unn
e
cessar
i
l
y
look for
a repo
s
i
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d Aguilar
submodule
.
c:
S
quelch
a
"use
before assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid A
g
uilar
diff:
gener
a
te pretty
filen
a
mes in
pr
e
p
_temp_blob
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Agui
l
ar
compat: add a basen
a
me() compatib
i
lity
f
u
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Agu
i
l
a
r
compat: add a mkstemps()
c
o
mpatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid
A
guilar
Add git-replace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguila
r
mergetool--lib:
a
dd su
p
port for ara
x
is merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid Ag
u
ilar
mergetool--l
i
b: specia
l
ize di
f
f optio
n
s for em
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mer
g
etool--lib
:
simpli
f
y API
u
sage by
r
emovin
g
mo
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguilar
d
ifftool/mergetool: refactor
commands to
u
se git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
mergetool: use $(
.
.
.
)
instead of
`backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
bash complet
i
on:
add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
iffto
o
l:
a
d
d
support
f
or a difftoo
l
.
p
rompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d Agu
i
lar
difftool:
ad
d
various git-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
fto
o
l: move 'g
i
t-difftool' out of c
o
n
t
rib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
Aguilar
difftool:
a
dd a -y shor
t
c
u
t
f
or
-
-no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: use
p
e
rl
b
u
ilt
-
ins when
t
esting
for
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
d
i
f
ftool: remove t
h
e backup f
i
le feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: rem
o
ve merge
o
ptions for
opendi
f
f
, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
A
g
uilar
every
d
ay: us
e
the
dash
l
ess
f
orm of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
id Aguilar
contrib/difftool: use a separate con
f
ig
n
am
e
spa
c
e for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Davi
d
Aguilar
c
o
ntrib
/
difftool: Don'
t
r
e
peat merge
t
o
o
l candid
a
t
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
i
f
f
tool: put the cursor
on
t
he editable
f
i
le for Vi
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Aguilar
difftool:
f
ix documentati
o
n problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib
:
add 'gi
t
dif
f
t
ool' for launchi
n
g common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
g
i
t-m
e
rg
e
tool: p
r
operly handle "git
m
e
r
getool -- filename
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
avi
d
Agui
l
ar
tests: add a t
e
stcase for
"gi
t
s
u
bmodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
g
i
t-submodule: add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule: r
e
place duplic
a
ted
c
o
de with a modu
l
e_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Da
v
i
d
Aguilar
[PATCH] gitk: Don't show local changes when we the
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree