repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
2009-04-08
Davi
d
Ag
u
ilar
difftool:
r
emove merge options
f
or opendif
f
, tk
d
iff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelberg
git-m
e
rg
e
tool: ad
d
n
e
w merg
e
tool TortoiseMerg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Ma
r
kus
H
ei
d
elberg
gi
t
-mergetool/d
i
fftoo
l
: ma
k
e (g)vimdiff workable under
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Marku
s
H
eide
l
berg
doc/merge-config:
l
i
s
t ecmerge as a bui
l
t-in
me
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
gi
t
-rev-list
.
txt: m
a
ke ascii markup uniform with other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
att
h
ieu Moy
git-send
-
em
a
il
.
txt: cl
a
rify which opti
o
ns take an ar
g
ument
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Jun
i
o C Hamano
M
e
rge branch 'jc/name-bran
c
h'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge branch 'jc/shared
-
l
iterally'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge b
r
anch 'mg/tracked
-
l
ocal-branches'
commit
|
commitdiff
|
tree
2009-04-06
Junio
C
Ha
m
ano
Mer
g
e b
r
anch 's
b
/format-patc
h
-pa
t
chname'
commit
|
commitdiff
|
tree
2009-04-06
Fel
i
pe Co
n
trer
a
s
user-manu
a
l: the name of
t
he hash
f
unction i
s
SHA
-
1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Felipe
C
o
n
t
reras
docboo
k
:
change css style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Con
t
reras
user
-
m
anual:
re
m
ove some git-fo
o
usa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
S
anti Béja
r
Documentation:
b
ranch
.
*
.
merge can
a
lso
af
f
ect 'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
H
eiko
Voigt
Add con
f
igur
a
tio
n
var
i
able for sign-of
f
to format
-
pa
t
ch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Todd Zullinger
b
a
s
h
co
m
pletion:
U
pda
t
e '
g
it
a
m' options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
J
u
n
i
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-05
Juli
e
n Danj
o
u
git submod
u
l
e: fix usag
e
line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Ju
n
io C Hamano
Merge
branch '
m
aint
-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-05
Junio
C
H
a
m
ano
M
e
r
ge branch
'
m
aint-1
.
6
.
0'
in
t
o
m
a
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus Heide
l
berg
doc/git-pack-refs: fix two grammar issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
tests: remove exit after
t
est
_
do
n
e call
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
co
m
mit: abort commit if interactive a
d
d failed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
C
hristia
n
Couder
bise
c
t
: impro
v
e
e
rror message when branch checkout
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Dan McGee
g
it-repa
c
k:
u
se n
o
n-dashed update-server-info
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jay
Soffian
send-ema
i
l:
fix nasty bug i
n
ask(
)
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio
C Hamano
U
pdate
d
r
a
f
t release notes
t
o 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
m
ano
S
ync with 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
GIT 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
man
o
Merge branch 'jc/main
t
-1
.
6
.
0-
b
lame-s' in
t
o m
a
int
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
Merge branch
'js/maint-diff-te
m
p-smudge' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
Merge
b
ra
n
ch 'js/maint-1
.
6
.
0-exec-p
a
th
-
env' i
n
to maint
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Hamano
Mer
g
e branch 'bc
/
maint-1
.
6
.
1-bran
c
h
-
d
e
l
e
t
ed-w
a
s' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio
C
Hamano
Merge b
r
anch
'
tr/
m
ai
n
t-1
.
6
.
1-doc-format-pat
c
h
--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio
C Hama
n
o
Me
r
ge branch '
d
m/maint-docco' int
o
maint
commit
|
commitdiff
|
tree
2009-04-02
J
ay Soffian
send-email: ensure quoted addre
s
ses are rf
c
2047 encoded
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send-em
a
i
l
:
correct two t
e
sts which
w
e
r
e
g
oing inte
r
a
ctive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
M
erge branch 'ef/fast-expo
r
t
'
commit
|
commitdiff
|
tree
2009-04-02
Junio C
H
am
a
n
o
Merge branch 'mh/
f
ormat-patch-add-header'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
H
a
mano
Mer
g
e branch 't
r
/mai
n
t
-
1
.
6
.
1
-doc-format-p
a
t
c
h
--root'
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C
Ham
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branc
h
'maint-1
.
6
.
1' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch '
m
a
int-1
.
6
.
0
'
i
nto
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
Merge branch 'cj/doc-format'
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Ham
a
no
M
erge branch 'jc/
m
ain
t
-
1
.
6
.
0-keep-pack'
commit
|
commitdiff
|
tree
2009-04-02
J
unio C
H
ama
n
o
Merge branch 'kb/
t
racking-count-no-m
e
rges'
commit
|
commitdiff
|
tree
2009-04-02
Wesley J
.
L
a
ndaker
Document
a
tion: git-svn: fix tr
u
n
k
/fe
t
ch sv
n
-rem
o
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
B
j
örn
S
t
einb
r
ink
Mailmap:
Allow empt
y
email
a
ddres
s
e
s
to be
m
apped
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
M
i
chael J Gru
b
e
r
Make loc
a
l br
a
nches beh
a
ve l
i
ke r
e
mote branches when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Heiko
Voigt
Cle
a
nup warning a
b
ou
t
known issues in cv
s
import
d
o
cume
n
tation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Ho
l
ger W
e
i
ß
Documentat
i
on: Remove an odd "instead"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-e
m
ail: ask
_
de
f
ault
s
h
o
u
ld apply to
a
ll ema
i
ls
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay
S
offi
a
n
send-e
m
ail: don't atte
m
p
t t
o
prom
p
t if tty is closed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t1301: loo
s
en t
e
s
t
for fo
r
c
e
d m
o
des
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
J
eff King
fix portability
p
roble
m
with I
S
_RU
N
_COMMA
N
D_ERR
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
S
t
ephen Boyd
f
o
r
mat_sanitiz
e
d_
s
ubj
e
ct: Don't trim
pa
s
t
i
ni
t
ial
length
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Chris Johnsen
Docum
e
nt
a
tion: u
s
e "spu
r
ious
.
sp" XSLT if DOCBOOK
_
SU
P
P
RESS_S
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
J
o
ha
n
nes Sch
i
ndelin
mailm
a
p: resurrect low
e
r-
c
asin
g
of
e
m
a
i
l addresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Junio C Hamano
Merge git://git
.
bogomip
s
.
org/gi
t
-svn
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami Rudi
builtin-c
l
one
.
c: no
need to
s
t
rdup
f
or
set
e
nv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Al
i
Ghola
m
i
Rudi
builtin-clon
e
.
c
:
m
ake
j
unk_pid sta
t
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hama
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-03-30
J
u
n
i
o C Hamano
Update draft
relea
s
e notes to 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge branch 'maint-
1
.
6
.
1'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2009-03-30
Junio C Haman
o
Merge branch 'ma
i
n
t-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Do
c
u
m
en
t
ation: push
.
default applies to all remotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
S
ant
i
Béjar
Doc
u
m
e
ntatio
n
: enhance branc
h
.
<
n
ame>
.
{remote,merge}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Daniel Chen
g
(a
k
a
.
.
.
F
i
x
bash completion in path with
spaces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
bash completion: only show 'log --merge' if me
r
ging
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telmich- Schot
.
.
.
git-tag(1):
add hint abou
t
commit messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Allan
C
af
f
ee
Docume
n
t
a
t
i
o
n: update graph a
p
i exam
p
le
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C
H
a
mano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C Hama
n
o
Me
r
ge bra
n
ch '
m
aint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
J
u
nio
C Hamano
M
erge branch 'ma
i
nt-1
.
6
.
0' into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffian
send-e
m
ail: add
tests for ref
a
ctored prompting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Ja
y
Soffian
send-email:
r
efactor
a
nd en
s
u
r
e
prompting doesn't loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wo
n
g
git-svn: f
i
x ls-tree usage with dash-prefixed paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Johannes Schi
n
delin
impor
t
-zips: fix thin
k
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-
L
und
builti
n
-fast-export
.
c: handle nested
t
ags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Fay
e
-Lund
builtin-fast-export
.
c: f
i
x cra
s
h on
tag
g
ed tr
e
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik
F
aye-
L
u
n
d
builtin-fast-export
.
c
:
turn error int
o
warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik
Faye-Lund
test-s
u
ite:
adding a test for fast-e
x
por
t
w
i
th
tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Jun
i
o C
H
amano
s
et_sha
r
ed_perm(): sometim
e
s we know what the f
i
nal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
move_temp_
t
o_file():
d
o
not
for
g
et to
c
hmod
(
)
in "
C
o
d
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-03-28
Junio C H
a
m
ano
Upda
t
e d
r
a
ft release notes to
1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Jun
i
o
C
Ha
m
ano
Merge
b
ranch 'jc/maint-1
.
6
.
0-dif
f
-
b
or
r
o
w
-
c
arefu
l
ly'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ham
a
no
Merge branch
'js/remote-im
p
ro
v
e
ments'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge branch '
j
k/clo
n
e-post-checkout'
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Hamano
Me
r
ge branch 'mai
n
t-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-28
Emil S
i
t
test-lib: Clean up comments an
d
Makefile
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
M
ichae
l
H
e
ndricks
format-p
a
tch:
add arbit
r
a
r
y
email headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
J
o
han Herland
Move chmod
(
foo, 0444) into
move_t
e
mp_
t
o_file(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
"co
r
e
.
sharedrepository =
0mode" should set,
n
ot
loose
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Michele Ba
l
labio
r
e
b
ase:
fix typo (force_rebas
-> force-rebas)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Christia
n
C
ouder
log-tree: fix p
a
tch filename computation in "g
i
t format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Michael J
Gruber
Tes
t
for loc
a
l branc
h
es being
f
o
llowed wit
h
-
-track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
T
homas
R
ast
Documentat
i
on: format-p
a
tch
-
-ro
o
t
cla
r
ification
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Junio C Hamano
Merge
bra
n
ch 'cj/doc-quiet' into cj/doc-format
commit
|
commitdiff
|
tree
2009-03-27
Chris Jo
h
nse
n
Docum
e
ntation: o
p
tion to render literal text as bold
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next