repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-fast-import.txt: improve documentation for quoted paths
2012-10-11
Dav
i
d Aguilar
m
ergetools/p
4
mer
g
e
:
Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d Agu
i
lar
mergetoo
l
--lib:
Allow custom
c
om
m
ands t
o
o
v
erride
b
u
ilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk: Rena
m
e
'
tagconten
t
s' to 'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agui
l
ar
gitk: T
e
ach
"Re
r
ead r
e
ferences
"
t
o
reload tag
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Agu
i
l
a
r
mergetoo
l
,diff
t
ool: D
o
cument --tool
-
help
c
onsis
t
en
t
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disable
-
-symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
ui
l
ar
diff
t
o
ol:
Handle compare
(
)
r
eturning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Wrap long line
s
for r
e
adability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Ag
u
ilar
difft
o
ol
:
Check a
l
l
r
e
t
u
rn cod
e
s fro
m
co
m
pare(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Aguilar
difft
o
ol:
Han
d
le fin
d
ing mergetools/
i
n
a
path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
dif
f
tool:
U
se
s
ymlin
k
s
when d
i
ffing against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftool: Call
t
he
temp dir
e
ctory "git-
d
ifftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguil
a
r
diff
t
ool: Move opt
i
on values into
a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
difft
o
ol: Eliminate global var
i
able
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
di
f
ftoo
l
: Sim
p
li
f
y print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
avid A
g
uila
r
t7800: Te
s
t difftool passing
arg
u
m
e
nts to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid
Agu
i
l
a
r
merge
t
ool: Pr
o
vide an e
m
pt
y
file when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Aguilar
Makefile: Improve compiler header dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
gu
i
la
r
mergetools/
m
e
l
d: Use '--output' when
available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
mergetool-
-
lib
:
Refac
t
or
t
ools into
sepa
r
ate
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
mergetool--lib: Mak
e
style consistent with
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
di
f
ft
o
ol--helper: M
a
k
e
style consistent
w
ith
gi
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503
-
pr
e
-comm
i
t-hook
.
sh: Ad
d
GIT
_
P
REFIX
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid
A
gu
i
lar
git-mergetoo
l
-
-lib: M
a
ke
v
imdiff retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
gi
t
: Remove handlin
g
for GIT_PRE
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
s
etup: Provide GIT_PREF
I
X to built-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule
s
ync: Update "s
u
bmodu
l
e
.
<na
m
e>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
merg
e
tool: Skip au
t
oreso
l
ved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
Agu
i
la
r
Docu
m
entation: E
x
plain
g
it-
m
ergetool
'
s use of t
e
mporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Aguil
a
r
M
a
kefi
l
e: Remo
v
e
usage of deprecated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix
'
--gui' when
diff
.
gui
t
ool is u
n
configured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Agui
l
ar
t7800-d
i
f
f
t
o
ol
.
sh:
Tes
t
mergetoo
l
.
prompt
f
a
llback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
ifftool: Update copyrig
h
t notices t
o
list ea
c
h yea
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
fftool:
Use e
v
al to expand '
-
-extcmd
'
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vi
d
A
g
u
i
lar
difftool: Ad
d
'-x' and
as an alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t
7
800
-
difftool
.
sh: Simplify the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
git-diff
.
t
xt: L
i
nk to git-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftoo
l
: Allow specifying un
c
onfigure
d
c
ommands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id A
g
uila
r
difftool--helper: Remove u
s
e o
f
the
G
IT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
if
f
t
o
o
l--h
e
lper: Up
d
ate copy
r
ight
a
nd
remove
d
istracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
git-difftool: Ad
d
'--
g
ui' for selecting a
GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguil
a
r
t7800-difftool: Set a bogus tool for use by
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David A
g
uilar
h
e
lp: Do not unnecessarily look for a repos
i
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David
Aguilar
su
b
module
.
c:
Squelc
h
a
"use before assignmen
t
" w
a
rning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
id Aguilar
diff: generate pret
t
y
filenames in
prep_te
m
p_blob(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a base
n
ame
(
) co
m
pa
t
ibility f
u
nctio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
ompat: add a
m
kstem
p
s
(
)
compatibi
l
i
ty func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
Add git-replace
t
o
.
git
i
gnore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Agui
l
ar
mergetoo
l
--li
b
:
a
d
d
support fo
r
araxi
s
mer
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
Aguilar
mergeto
o
l--li
b
: specialize d
i
ff
options
for em
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool
-
-lib: s
i
mplify AP
I
u
sage by remov
i
ng more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
diffto
o
l
/m
e
rg
e
to
o
l
: refactor comma
n
ds
to u
s
e g
i
t-merget
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
mergetool: use $(
.
.
.
) instead of `
b
ackticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
bash completi
o
n
:
add git
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol: ad
d
su
p
port for a difft
o
ol
.
pr
o
mpt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
d
i
f
ftool: ad
d
va
r
ious
gi
t
-d
i
f
ftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
di
f
ft
o
ol:
move 'git-difftool' out of co
n
trib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
difftoo
l
: add a -y shortcut fo
r
--no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: use pe
r
l
b
uilt-ins whe
n
tes
t
ing
for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: remove the backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
A
guilar
difftool: remove m
e
rge o
p
t
i
ons for opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d Ag
u
ilar
everyday: us
e
the dashless
f
orm of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Agu
i
lar
c
o
ntrib/diff
t
ool: use a separate config na
m
espace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
c
o
ntrib/dif
f
tool:
Do
n
't repeat m
e
rge to
o
l candi
d
ate
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguila
r
difft
o
o
l
:
put t
h
e cursor on the editabl
e
f
ile for
V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
i
d Aguila
r
difftool: f
i
x
docume
n
t
a
tion
p
rob
l
ems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
A
guilar
contrib: add 'git dif
f
to
o
l' for launc
h
ing
c
ommon
m
e
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David A
g
uilar
git-merg
e
tool: prope
r
l
y h
a
ndle "git merget
o
ol -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests
:
a
d
d
a
te
s
tcase
f
o
r
"git submodule s
y
nc"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
avid Aguilar
git-s
u
b
m
odule: add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-sub
m
o
dule: replace dupli
c
ated code wit
h
a module_l
i
st
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguil
a
r
[
P
ATCH] gitk: D
o
n't
s
how
l
ocal cha
n
ges when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree