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.7.1-rc0
2010-03-29
David Aguilar
M
akefile: Re
m
ove usage of dep
r
e
c
ate
d
Python "h
a
s_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Aguilar
d
i
fftool: Fix '--
g
u
i' when diff
.
gu
i
tool is unc
o
nfi
g
ur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Agui
l
ar
t7800-
d
ifftool
.
sh: Test merget
o
ol
.
pr
o
mpt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
ifftool
:
Update co
p
yright notic
e
s to
l
ist each ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool
:
Use eval t
o
ex
p
a
n
d
'--ex
t
c
md
'
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
A
guila
r
dif
f
tool: Add '-x' and as an
a
lias f
o
r '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
t7800-di
f
ftool
.
sh: Simplify the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git
-
d
iff
.
txt: Link
t
o git
-
di
f
ftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguila
r
difftoo
l
: Allow speci
f
ying un
c
onfigured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguila
r
diff
t
o
o
l--helper:
Remove use of the G
I
T_M
E
RG
E
_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Ag
u
ilar
diff
t
ool--helpe
r
: Up
d
ate copyright and remove distra
c
tin
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
git-difftoo
l
: Add
'--gui' for
selecting a
G
UI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7
8
00-difft
o
ol: Se
t
a bogus tool f
o
r use by t
e
st
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
avi
d
A
g
u
i
l
ar
help:
Do not u
n
necessarily
look for
a
r
e
pository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David A
g
uilar
submodule
.
c: Squ
e
lch a "use before assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
gui
l
a
r
d
iff: g
e
nerate pr
e
tty filenames
i
n pr
e
p_tem
p
_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
co
m
p
at: add a basename()
c
ompatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguila
r
compa
t
:
ad
d
a mkst
e
mps() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
uil
a
r
Add git-replace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--
l
ib: add support for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
Aguilar
merge
t
o
ol
-
-lib: spec
i
alize d
i
ff opt
i
ons for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
me
r
getool--lib: simpli
f
y AP
I
u
sag
e
by removin
g
more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
ar
di
f
fto
o
l/mergetool
:
refacto
r
commands
t
o
use git-m
e
rg
e
tool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
me
r
g
e
t
ool: use $(
.
.
.
) ins
t
e
ad of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
bash co
m
pleti
o
n:
add
g
it-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
add support for a difftool
.
prompt co
n
fig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: add various git-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Ag
u
ilar
dif
f
tool: move '
g
it-dif
f
t
o
ol' o
u
t
of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
A
guila
r
dif
f
tool: add
a -y sh
o
rtcu
t
for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
d
i
fftool
:
use perl bu
i
l
t-in
s
w
hen testing fo
r
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d A
g
uilar
difftool: remove the backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
diffto
o
l
:
r
e
m
ove mer
g
e
o
ptions for opendiff, t
k
di
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David A
g
u
ilar
everyday: use the
d
a
s
hless
f
orm o
f
git-
i
nit
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David
A
guila
r
contri
b
/difftool
:
use a separate
conf
i
g
na
m
espace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d
Aguilar
con
t
rib/
d
ifftool
:
Don't re
p
eat m
e
rg
e
to
o
l candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: put the cursor on the edi
t
able file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid
A
guilar
difftool
:
fix docum
e
ntation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
Ag
u
i
lar
contrib: add 'git diffto
o
l
' for
l
a
u
nching common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Dav
i
d
Aguilar
git-mergetool
:
prop
e
rly
handle "git mergetool
-
- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David A
g
uilar
tests: add
a tes
t
case for "git
su
b
module sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Ag
u
ilar
git-submodule:
add "s
y
n
c
"
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Davi
d
Agui
l
ar
git
-
su
b
module
:
replace duplicated co
d
e with a module_li
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguil
a
r
[PATCH]
gi
t
k:
D
o
n
'
t
show local changes when
w
e there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree