repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool/mergetool: add diffuse as merge and diff tool
2009-04-08
Sebastian
P
i
p
ping
difft
o
ol/mergetool: add diffuse as merge and diff to
o
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
f
t
oo
l
: a
d
d a -y shortcut for --no-
p
rompt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d Ag
u
i
l
ar
difftoo
l
:
u
se pe
r
l built-ins
when testin
g
for
msys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
difftool:
r
emove the b
a
ck
u
p file fe
a
ture
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
il
a
r
diff
t
ool: rem
o
ve merge o
p
tions for o
p
e
ndiff, tkdiff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelb
e
rg
git-mergetool: add new merge tool TortoiseMerge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelberg
git-merge
t
ool/difftool:
m
ake (g)v
i
mdi
f
f work
a
ble under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidel
b
e
rg
d
oc/merge-c
o
nfig: list ecmerge a
s
a built-in merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Mo
y
git-re
v
-
l
is
t
.
txt: make asc
i
i
markup
unifor
m
with
other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthie
u
Moy
git-send-email
.
txt: clarify whic
h
options tak
e
an ar
g
um
e
n
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Juni
o
C
H
a
mano
Me
r
g
e branch
'
jc/name-b
r
anch'
commit
|
commitdiff
|
tree
2009-04-06
Ju
n
io
C Hamano
Merge branch 'jc
/
sh
a
red-literally'
commit
|
commitdiff
|
tree
2009-04-06
Juni
o
C Ham
a
no
Mer
g
e branch 'mg/tracked-local-branc
h
es'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge branch 'sb/format-patch
-
p
a
tchname'
commit
|
commitdiff
|
tree
2009-04-06
F
e
lipe Co
n
trera
s
user-m
a
nual: t
h
e name of the hash
f
u
nction is SHA
-
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
F
elipe Contreras
d
o
c
book: change cs
s
styl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Fe
l
ip
e
Contreras
u
s
er-manua
l
: remove some git-fo
o
usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Sant
i
Béjar
D
ocumentation: branch
.
*
.
merge
can also affect 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Voigt
Add configurat
i
o
n
v
ar
i
able for sign-off
t
o format-patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Todd Zullinger
bash c
o
mp
l
eti
o
n: Update 'g
i
t
am'
opt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Haman
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-04-05
Jul
i
en
Dan
j
ou
git submodule: f
i
x
u
s
a
ge
l
ine
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C
H
amano
M
erge branch 'maint-1
.
6
.
1' i
n
to
m
aint
commit
|
commitdiff
|
tree
2009-04-05
Ju
n
io C
Hamano
Merge
br
a
nch
'
mai
n
t-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
M
a
r
k
us Heidelberg
doc/git-pack-
r
efs: fix two g
r
ammar i
s
sues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff
K
ing
tests: remov
e
e
x
it after test_done call
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
J
eff King
co
m
m
it: abort commit if interactive add failed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christia
n
Cou
d
er
b
i
sec
t
: improve er
r
o
r me
s
s
a
ge when branch checkout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
D
a
n McGee
git-repack: use non-dash
e
d update
-
s
e
rver-info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffian
send-email: fix nasty bug i
n
ask(
)
fun
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
U
p
d
a
te draft re
l
ease note
s
t
o
1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Ha
m
ano
Sync
with 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hama
n
o
GIT 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch '
j
c/maint-1
.
6
.
0-blam
e
-s'
in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge branch 'js/maint-d
i
ff-temp-smudge' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
i
o
C Ha
m
ano
Merge bran
c
h 'js/maint-1
.
6
.
0-exec-p
a
th-env'
i
nto maint
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Ham
a
no
Merge b
r
anch 'bc/ma
i
n
t
-1
.
6
.
1
-
branch
-
deleted-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch
'
tr/
m
ain
t
-1
.
6
.
1-doc
-
format-patch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branc
h
'dm/ma
i
nt-do
c
co' into maint
commit
|
commitdiff
|
tree
2009-04-02
J
ay
So
f
f
i
an
send-email: ensure
q
u
o
ted
addre
s
ses are
r
f
c2047 e
n
coded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send-email: correct two tests wh
i
ch were
goi
n
g inte
r
a
ctive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge bra
n
ch 'ef/fast-ex
p
o
rt'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Mer
g
e
branch 'mh
/
format-patch-add-header'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
M
erge
branch 'tr/maint-1
.
6
.
1-d
o
c
-
format-patch--roo
t
'
commit
|
commitdiff
|
tree
2009-04-02
Junio C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
e
rge branch 'mai
n
t-1
.
6
.
1' into m
a
int
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Hamano
M
e
rge br
a
nch 'm
a
int-1
.
6
.
0'
i
nto maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge
branch 'cj/doc-format'
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io
C
H
amano
Merg
e
branch 'jc/maint-1
.
6
.
0-k
e
ep-pack'
commit
|
commitdiff
|
tree
2009-04-02
J
unio C H
a
mano
Merge br
a
nch 'kb/tracking-count
-
no-merges'
commit
|
commitdiff
|
tree
2009-04-02
Wesley J
.
L
a
ndaker
Documentati
o
n
:
g
it-svn: fix
t
runk/
f
etch svn-remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Bjö
r
n Stei
n
brink
Mailma
p
: Al
l
ow empty e
m
a
i
l addresses
t
o be mapped
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Michael
J Gruber
Mak
e
local
b
ranc
h
e
s
b
e
have
l
ike remote b
r
anch
e
s
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Hei
k
o Voigt
Clean
u
p warn
i
ng about k
n
own
is
s
u
es i
n
cvsimport documentati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Holger W
e
iß
Documentatio
n
:
Remov
e
an odd "
i
nstea
d
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay So
f
fian
s
e
nd
-
emai
l
: ask_default should a
p
ply t
o
all emails
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
s
e
nd-email: do
n
't
a
ttempt
t
o
p
r
ompt if tt
y
is
cl
o
sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff Ki
n
g
t1301: loos
e
n test for forced modes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff
K
in
g
fix po
r
t
a
bility problem w
i
th IS_RUN_COMMAND_ER
R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Stephen Bo
y
d
f
ormat_sa
n
it
i
zed_subject: Don't
t
rim past initi
a
l
l
e
ngth
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
C
h
ris J
o
hnsen
Docu
m
entation:
use "s
p
urious
.
sp"
X
SLT
i
f DO
C
BOO
K
_SUPPRESS_S
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
o
hannes Schindelin
mai
l
m
a
p
: resu
r
r
e
ct lower-casi
n
g o
f
email addr
e
sses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
unio C Ham
a
no
Merge git:
/
/git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-04-01
A
l
i
G
holami R
u
di
builtin-clone
.
c
:
no
need t
o
st
r
dup
f
or setenv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
A
li
Gho
l
ami Ru
d
i
builtin-clone
.
c: make
j
unk_pid static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
M
er
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ha
m
ano
Up
d
ate draf
t
rel
e
ase notes to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
J
u
n
io C Hamano
Merge branc
h
'maint
-
1
.
6
.
1' into
m
aint
commit
|
commitdiff
|
tree
2009-03-30
Junio
C Hamano
Merge branch 'main
t
-
1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Documentation: push
.
defaul
t
applies to
a
ll remotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Santi Bé
j
ar
Documentatio
n
: enhanc
e
branc
h
.
<name
>
.
{r
e
mote,merge}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Da
n
iel Cheng (aka
.
.
.
Fix bash completion in path wi
t
h s
p
aces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Tho
m
a
s Rast
bash compl
e
tion:
o
n
ly
show 'log
-
-
m
erge
'
if mergi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
N
i
co -telmic
h
- Schot
.
.
.
gi
t
-tag(1): add hint a
b
out
commit message
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Allan
C
a
ffee
Documenta
t
ion: up
d
ate graph api example
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C
Hamano
M
er
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Haman
o
Merge b
r
anc
h
'ma
i
nt-1
.
6
.
1' int
o
maint
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C
H
amano
Merge bra
n
ch
'maint-1
.
6
.
0' in
t
o main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Ja
y
Sof
f
ian
sen
d
-email
:
a
dd tests fo
r
r
e
f
actored
p
rom
p
t
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
J
ay Soff
i
an
send-
e
m
a
il:
r
e
factor and
e
n
sure prompting d
o
esn'
t
l
oop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
git-svn: fix ls-tree
u
s
a
ge
w
ith dash
-
pref
i
xed paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Johannes Schin
d
e
l
in
im
p
ort-z
i
ps: fix thinko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
built
i
n-fast-expo
r
t
.
c
: handle
nested tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lu
n
d
builtin-fast
-
export
.
c: fix crash on tagged trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lun
d
b
u
iltin-fast-export
.
c: turn erro
r
into warni
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eri
k
Fa
y
e-
L
und
test-suit
e
: adding a test
for fast-expor
t
with tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
set_shared_perm():
s
om
e
times we know what the final
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
move_temp_to_fil
e
(
): do not fo
r
get to
c
hmod()
in "Coda
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-03-28
J
unio C Hamano
Update draf
t
re
l
ease notes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C
H
amano
Merge branch 'jc/maint-1
.
6
.
0-diff
-
b
o
rrow
-
c
a
reful
l
y'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
M
erge branc
h
'
js
/
remote-imp
r
o
vements'
commit
|
commitdiff
|
tree
2009-03-28
Junio C
Ha
m
a
no
M
e
rge branch 'jk
/
cl
o
ne-post-checkout'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ham
a
no
Mer
g
e branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-28
E
mil Sit
test
-
lib:
C
lea
n
up com
m
ents and M
a
kefile
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Michael Hendrick
s
format-p
a
tch: add arbitrary
e
mai
l
header
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Johan
H
erland
Mo
v
e
c
h
m
o
d
(foo, 0444) into move_te
m
p_to_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
"core
.
sharedrepository = 0mode" should set, not lo
o
sen
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Mi
c
hele Ball
a
bio
rebase:
f
ix typo (force_rebas -
>
f
o
r
c
e-rebas)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Ch
r
isti
a
n Couder
lo
g
-tree: fix patc
h
filen
a
me
c
om
p
utation in "git format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next