repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: add various git-difftool tests
2009-04-08
David A
g
uilar
difftool: add various git-diff
t
ool tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftoo
l
:
mov
e
'git-difftool'
o
u
t
of contrib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Sebastian Pipping
difft
o
ol/mergetool: add dif
f
u
s
e
as merge and d
i
ff to
o
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool: add a -y shortcut for
-
-no-prompt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
:
use perl built-
i
ns when
testin
g
fo
r
m
s
y
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
dif
f
tool: remove the
b
acku
p
fil
e
f
e
ature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agui
l
ar
di
f
f
tool: remo
v
e
merge o
p
tion
s
f
o
r opendif
f
, tkdiff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heid
e
lberg
git
-
m
e
r
getool
:
add n
e
w mer
g
e to
o
l
T
ortoiseMerge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Markus
H
eidelb
e
rg
g
i
t-me
r
getool/dif
f
tool: ma
k
e (
g
)vi
m
di
f
f wo
r
kable under
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
rkus Heidelberg
do
c
/merge-confi
g
:
l
ist ecmer
g
e as a built-i
n
mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Mat
t
hieu Moy
git-rev-list
.
txt: make a
s
c
ii markup
u
n
i
f
o
rm wit
h
other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
th
i
eu Moy
git
-
send-email
.
txt: clarify which
o
p
t
i
o
n
s take an argum
e
nt
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Haman
o
Merge bra
n
ch
'jc/name-branc
h
'
commit
|
commitdiff
|
tree
2009-04-06
Jun
i
o C
Hamano
M
e
rge branch 'jc/shared-
l
iterally
'
commit
|
commitdiff
|
tree
2009-04-06
J
u
n
i
o C Hamano
M
erge bran
c
h
'
mg/
t
racked-l
o
cal-
b
ra
n
ches'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge branch
'
s
b
/format-pat
c
h-patchname
'
commit
|
commitdiff
|
tree
2009-04-06
Felipe
C
ontreras
user-manual: the na
m
e
of the has
h
funct
i
on
is SHA-1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
F
e
lipe Contreras
d
ocbook:
change
css style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contreras
user-manual
:
remove some git
-
f
o
o usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Sant
i
Béjar
Docu
m
entation:
b
ran
c
h
.
*
.
merg
e
can also
aff
e
ct 'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Voigt
Add configura
t
io
n
vari
a
b
l
e for si
g
n-off to format-
p
atch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Todd Zulli
n
ger
b
ash completion: Upda
t
e 'git am
'
options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio
C Hamano
Merg
e
branch
'maint'
commit
|
commitdiff
|
tree
2009-04-05
Julien Danjou
git submod
u
le: fi
x
u
sage line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Juni
o
C H
a
mano
Merge branch
'
m
aint-1
.
6
.
1'
i
nto maint
commit
|
commitdiff
|
tree
2009-04-05
Junio
C
H
amano
Merge
b
ranch
'
m
aint-1
.
6
.
0' in
t
o m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus Heide
l
b
erg
doc/git-
p
ack-ref
s
: fix two grammar issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jef
f
King
tests: remove exit
a
f
ter
te
s
t_done call
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
commit: a
b
ort commit if interact
i
ve add fa
i
led
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
bisect:
i
mprove er
r
or message when
branch checkout
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Dan McGee
git-repack: use non-dashed
upd
a
te
-
server-info
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffian
s
e
n
d-em
a
il: fix
na
s
t
y bu
g
in a
s
k() fun
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
an
o
Update draft releas
e
n
o
tes t
o
1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Hamano
Sync
with 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
H
a
m
a
no
G
IT 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hamano
Merge
b
ranch 'jc
/
maint-1
.
6
.
0-blame-s' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Me
r
ge branch 'js/main
t
-diff-temp
-
smu
d
g
e' int
o
m
aint
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
Mer
g
e branch 'js/ma
i
nt-1
.
6
.
0-e
x
ec
-
path-env' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hamano
Merge branch 'bc/m
a
int-1
.
6
.
1-branch-delete
d
-
w
as'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merg
e
bra
n
ch 'tr
/
mai
n
t-1
.
6
.
1-doc-for
m
at-patch--roo
t
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
ma
n
o
Merge branch 'dm/maint-d
o
cco' into maint
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send-
e
mail: ensu
r
e q
u
oted addres
s
es are rfc
2
04
7
encoded
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
J
ay
Soff
i
an
send-email:
co
r
rect two
t
e
s
ts
which wer
e
going interactiv
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'ef/fa
s
t-export'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C
H
amano
Merge br
a
nch
'
mh/format-patch-add-header'
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Hama
n
o
Me
r
ge br
a
nc
h
'
tr/mai
n
t-1
.
6
.
1-doc-format-p
a
tch
-
-ro
o
t
'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hamano
Merge
branc
h
'maint'
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio
C
H
amano
Merge branc
h
'm
a
int-1
.
6
.
1
' into maint
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C H
a
mano
M
e
rge branch 'maint
-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C
H
a
mano
M
e
rge branc
h
'cj/doc-f
o
rmat'
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Hamano
Merge
b
ranch 'jc/maint
-
1
.
6
.
0
-
keep-pack'
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
ma
n
o
Merge branch 'kb/tra
c
k
i
n
g-
c
ount
-
no-merg
e
s'
commit
|
commitdiff
|
tree
2009-04-02
Wesley J
.
Lan
d
aker
Doc
u
mentation: git-svn: fix
t
runk/fetch svn-remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Björn Ste
i
nbrin
k
Mailma
p
: Allow empty
e
mail
address
e
s to be
m
apped
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Michael J G
r
uber
Make local
b
ranches be
h
ave lik
e
remote branches
w
hen
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Heiko
Voigt
Cleanup
w
a
r
ning about known
i
s
sues in
c
vsimpo
r
t docu
m
entation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Holger Weiß
Doc
u
me
n
t
a
t
i
o
n:
R
emove a
n
od
d
"instea
d
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
J
a
y Soffian
send
-
email: ask_default
s
hould a
p
ply to all emails
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-email: don'
t
a
t
t
e
mpt t
o
promp
t
if tty is
closed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff Kin
g
t13
0
1: l
o
o
s
e
n test for forced
m
odes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix portab
i
lity pro
b
lem wi
t
h
IS_
R
UN_COMMAND_ERR
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Stephen
B
o
y
d
f
o
rmat_sanitized_subject:
Do
n
't trim past i
n
itial length
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Chris Johnsen
Document
a
t
ion:
u
s
e "spurious
.
sp" XSLT if DO
C
BOOK_SUPPRESS_S
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Johannes
Schin
d
e
lin
mailmap: resurre
c
t lower-casing o
f
ema
i
l address
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Junio C Hamano
Merge g
i
t://git
.
bogomips
.
org/git-sv
n
commit
|
commitdiff
|
tree
2009-04-01
Ali Ghol
a
mi
R
udi
bui
l
t
in-clone
.
c: no n
e
ed to strdup fo
r
s
etenv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Ali
Gh
o
lami Rudi
buil
t
in-clone
.
c:
m
a
ke junk_pid static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C
H
amano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
Hamano
Updat
e
d
r
aft release notes
to 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C
Ham
a
n
o
Merge branch 'maint-1
.
6
.
1' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hama
n
o
Me
r
ge
b
ra
n
ch 'm
a
int-1
.
6
.
0' int
o
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Documentation: push
.
default
a
ppli
e
s to
a
l
l
r
emotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Santi B
é
jar
Document
a
t
ion: enhance branch
.
<name>
.
{r
e
mote,merge}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng
(
aka
.
.
.
Fix b
a
sh c
o
mpletion i
n
p
ath with s
p
aces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Thomas
Rast
bash com
p
letion: only
s
ho
w
'log --
m
erge'
if mergi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
N
i
c
o
-telmich- Schot
.
.
.
g
it-
t
a
g(1): add h
i
nt abou
t
c
o
mmit mess
a
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Al
l
an Caff
e
e
D
o
c
u
m
entation:
u
pd
a
te graph
api
e
xample
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
Hamano
M
e
rge branch 'maint
'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Me
r
ge branch 'ma
i
nt-1
.
6
.
1' i
n
to m
a
int
commit
|
commitdiff
|
tree
2009-03-30
Ju
n
i
o C
Hamano
Merge br
a
nch 'main
t
-1
.
6
.
0' i
n
to main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
J
ay Soffian
send-
e
mail: a
d
d
t
ests for r
e
factored prompting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soff
i
an
se
n
d-email: refac
t
or and ensu
r
e
prompting doesn't loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Eric Won
g
git-svn: fix ls-tree usag
e
with das
h
-pr
e
fixe
d
p
aths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Johanne
s
S
c
h
indelin
i
m
po
r
t-zips:
f
i
x th
i
nko
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
b
u
iltin-fast-expo
r
t
.
c:
h
a
n
dle nested t
a
gs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
bui
l
t
i
n-
f
ast-export
.
c: fix cr
a
sh on tagged tree
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Er
i
k
Faye-Lun
d
builtin-
f
a
st-export
.
c:
t
urn e
r
ror i
n
t
o warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
E
r
ik Fay
e
-
Lund
test-
s
uit
e
:
addin
g
a test fo
r
f
ast-export with tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
J
unio
C
Hamano
set_shared_perm(): sometim
e
s
we know what the final
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
i
o
C
H
a
man
o
mov
e
_
temp_to_
f
ile(): do not forget
t
o chmod(
)
in "Coda
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C
H
a
m
a
no
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Upda
t
e
draft rel
e
ase no
t
es
to 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
i
o
C Hamano
Merge branch
'
jc/ma
i
nt-1
.
6
.
0-diff-bo
r
row-carefully'
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Hamano
Me
r
g
e
b
r
a
n
ch 'js/re
m
ote-
i
m
provem
e
nts'
commit
|
commitdiff
|
tree
2009-03-28
Junio
C Hama
n
o
Merge bran
c
h
'
jk/c
l
one-post-checkout'
commit
|
commitdiff
|
tree
2009-03-28
Juni
o
C Hamano
Merge branch 'maint-1
.
6
.
1'
i
nto maint
commit
|
commitdiff
|
tree
2009-03-28
Emil Si
t
t
est-lib:
C
lean up comments and Makefile
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Michael Hendricks
format-patc
h
: add
arbit
r
ary
email h
e
ad
e
rs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Joh
a
n Herland
Mo
v
e chmod(foo, 0444)
i
nto move_temp_to_fil
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C
H
amano
"
c
or
e
.
sh
a
red
r
epositor
y
= 0m
o
de"
s
houl
d
se
t
,
n
ot loosen
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next