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
merge: backport GIT_MERGE_AUTOEDIT support
2012-03-20
Junio C H
a
mano
merge: backpor
t
GIT_MERGE_
A
UTO
E
D
I
T support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
u
nio
C
Hamano
Git 1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Juni
o
C
H
amano
Me
r
ge b
r
a
n
ch 'tr/maint-
b
u
n
dle-boundary' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-03-12
Junio C Ham
a
no
Merg
e
bran
c
h 'j
c
/
main
t
-dif
f
-pat
c
h-
h
eader' into m
a
int
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge branch 'jn/m
a
int-do-not-
m
atc
h
-wi
t
h-unsa
n
i
t
ized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio
C
Hamano
Merge branch 'jc/
a
m-3-no
n
s
tandard-popt' into maint
commit
|
commitdiff
|
tree
2012-03-06
Juni
o
C
Hamano
Merge
b
ranch
'maint-1
.
7
.
8' into main
t
commit
|
commitdiff
|
tree
2012-03-06
J
u
nio C Ham
a
no
Merge branc
h
'main
t
-1
.
7
.
7' in
t
o ma
i
nt-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C Hamano
Git 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
Haman
o
Mer
g
e br
a
nch 'jc/doc-me
r
g
e-op
t
ions
'
into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ha
m
ano
M
e
rge
br
a
nch 'cn/ma
i
nt-rev
-
list-doc' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Update draft releas
e
notes to 1
.
7
.
9
.
3 for the last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Hama
n
o
Merge
b
ranch 'cn/maint-branch-with-ba
d
' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C
H
a
m
an
o
Merge bra
n
c
h
'jn/
m
aint-gitw
e
b-invalid-regexp'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o
C
H
amano
Merge
b
r
anch 'nd/maint-verify-obje
c
t
s
'
into maint
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o
C Hama
n
o
Merge branch
'
jk/
m
a
int
-
a
v
oid-
s
treami
n
g-filte
r
ed
-
contents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
io C Hamano
Merge
branch 'jb/
f
i
lter-ignore-sigpipe' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch
'sp/
s
m
art-http-f
a
ilure-to-push' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hama
n
o
Merg
e
branch 'tr/ma
i
nt-bundle-long-subj
e
ct' into
m
aint
commit
|
commitdiff
|
tree
2012-03-02
Junio C H
a
mano
Documentation:
do
n
o
t
assume that
n > 1 in
<
rev>~$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
J
unio C Haman
o
diff -p
:
s
quelch
"diff --git" head
e
r for stat-di
r
t
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio
C
Ha
m
ano
t4011: illustrate "diff-
i
ndex -p" on s
t
at-dirty paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Ham
a
no
t4011
:
modernise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C H
a
mano
Updat
e
d
r
a
ft release notes to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Hamano
Merge branch 'pj/rem
o
te-set-branches-usage
-
fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Hamano
M
e
rge branch 'jn/gitw
e
b-unbor
n
-head
'
into maint
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Hama
n
o
Me
r
ge b
r
anch '
j
n
/
a
n
cient
-
meld-support' into main
t
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Haman
o
Merge b
r
a
n
c
h
'tr/merge-edit-guidance' into main
t
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Hamano
test: "am -3" can a
c
cep
t
n
on-standard -p<num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
unio
C Ham
a
no
D
o
cume
n
t
acc
u
mula
t
ed fixe
s
since
1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C H
a
ma
n
o
Merge
b
ran
c
h 'jc/add-refre
s
h-unmerged'
i
nto maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Mer
g
e branc
h
'js/config
u
re-libi
n
tl' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Sync with
1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Git 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
J
u
n
i
o
C Hamano
Document m
e
rg
e
.
branchdesc configuration variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
J
u
nio C
H
amano
am -
3
: allow n
o
nstandard -p<num> opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio C
H
a
mano
G
it 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-22
J
u
nio C Haman
o
D
o
cumentation/merge
-
o
p
t
ions
.
txt:
g
roup
"ff"
r
elated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
U
p
dat
e
draft
r
e
l
ease notes
to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Ju
n
io C Hamano
M
erge branch 'c
b
/r
e
ceive-p
a
c
k
-k
e
ep-errors' into maint
commit
|
commitdiff
|
tree
2012-02-21
J
u
n
io C Hama
n
o
Merge branch 'cb/transfer-no
-
pr
o
gress'
into main
t
commit
|
commitdiff
|
tree
2012-02-21
J
u
n
io C Hamano
Mer
g
e
branc
h
'jk/gi
t
-dir-lookup' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-21
J
u
nio C Ha
m
ano
Mer
g
e
b
r
a
nch 'jc/dif
f
-stat-scaler' into
m
aint
commit
|
commitdiff
|
tree
2012-02-21
Junio C
Hamano
Merge branch
'zj/term-
c
olumns
'
into maint
commit
|
commitdiff
|
tree
2012-02-21
J
u
ni
o
C H
a
mano
Merge branch '
c
b
/
m
ain
t
-rev-l
i
st-verify-object'
into
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
J
un
i
o C H
a
mano
Merge br
a
nch
'c
b
/
maint-t5
5
41-make
-
server-
p
ort-portable
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C Hamano
Me
r
ge branch 'dp/i18n
-
lib
c
harset'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C
Hamano
Merge branch 'jk/grep-binary-a
t
t
ribut
e
' into maint
commit
|
commitdiff
|
tree
2012-02-21
J
u
nio C
H
a
m
a
no
Merge branch 'nd/d
i
ffstat-gramnum' into main
t
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
M
erge branch
'nd/find
-
pack-entry-recent-cache-
i
nvalidation
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio C Ham
a
no
Merge br
a
nch
'
tt/p
r
ofile-bui
l
d-fix' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-02-21
Junio C
H
a
m
ano
M
erge bra
n
ch 'fc/zsh-
c
ompletion
'
into maint
commit
|
commitdiff
|
tree
2012-02-20
Junio C Hamano
Update dra
f
t
rele
a
se notes to
1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-17
Junio C Ha
m
a
no
refr
e
sh_index: do no
t
show
unm
e
r
g
ed pa
t
h
that is outside
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Junio C
H
amano
Updat
e
draft release no
t
es to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Junio
C
Ham
a
no
Merge bra
n
ch 'jc
/
checkou
t
-
o
ut-of
-
unb
o
r
n
'
int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-02-16
Junio C
Hama
n
o
M
erge
branch
'
jc/main
t
-
m
ailmap-
o
u
t
p
u
t' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C
H
amano
Merge branch 'jk/prom
p
t
-fallback-to-tty' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C H
a
mano
Merge branch 'jn/gitweb-search-utf-8' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Ham
a
no
Merge branch 'jc/maint-com
m
it-ignore-
i
-t-a' into maint
commit
|
commitdiff
|
tree
2012-02-16
J
u
n
io C Hamano
Merge
bra
n
ch 'm
m
/empty-loose-
e
rror-message' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Ha
m
ano
M
e
rge branch 'nk/c
t
ype-for-p
e
rf' into maint
commit
|
commitdiff
|
tree
2012-02-16
Juni
o
C H
a
mano
Merge
b
ranch 'jx/
i
18n-more-mar
k
i
ng' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C
Hamano
Me
r
ge
b
ranch 'rt/completion-branch-
e
d
it-desc' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
diff -
-
stat:
show bars of
s
ame le
n
gth for paths with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Git 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Merge branch 'jk/ma
i
n
t
-tag
-
show-
f
i
xes' into mai
n
t
commit
|
commitdiff
|
tree
2012-02-14
Jun
i
o C Hama
n
o
Me
r
g
e
bran
c
h 'b
w
/inet-
p
ton-ntop
-
compat' into maint
commit
|
commitdiff
|
tree
2012-02-14
Jun
i
o C H
a
mano
Merge branch 'mp
/
make-
c
l
e
a
n
se-x-for-e
x
e'
into mai
n
t
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
Me
r
ge
branch 'jn
/
merge-no-edi
t
-fix' into maint
commit
|
commitdiff
|
tree
2012-02-13
Junio C Hamano
Up
d
ate draft
r
ele
a
se notes to 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-13
Junio C Hamano
Merge branch
'
j
s
/add
-
e-s
u
bmodule-fix' in
t
o maint
commit
|
commitdiff
|
tree
2012-02-13
Junio C
H
amano
Merge branc
h
'jc/par
s
e-date-raw'
into maint
commit
|
commitdiff
|
tree
2012-02-13
J
unio C Hamano
Merge bran
c
h 'j
c
/merg
e
-ff-only-stronger
-
th
a
n-signed
.
.
.
commit
|
commitdiff
|
tree
2012-02-13
Junio C Ha
m
an
o
Merge branch '
j
c/branch-desc-typoavoida
n
ce' into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-13
Ju
n
i
o C Hamano
Merge branch 'jn/rpm-spec
'
int
o
maint
commit
|
commitdiff
|
tree
2012-02-10
Ju
n
io C Ha
m
ano
Update
draf
t
release
n
otes to 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-10
Junio C H
a
mano
M
e
rge branch 'j
c
/
maint-
r
eq
u
est-pul
l
-for-tag' into
m
aint
commit
|
commitdiff
|
tree
2012-02-10
Junio C
Hamano
Merge bra
n
ch 'tr/grep
-
l-
w
ith-de
c
orat
i
on' into maint
commit
|
commitdiff
|
tree
2012-02-10
Junio C
H
ama
n
o
Merge
b
ranch
'jl/submodule-re-add' into maint
commit
|
commitdiff
|
tree
2012-02-10
Junio C Hamano
Me
r
g
e branch 'da/maint
-
m
e
rgetool-tw
o
w
a
y' into maint
commit
|
commitdiff
|
tree
2012-02-09
Junio C
Ha
m
ano
m
e
rge: do no
t
l
a
u
nch a
n
editor on "--no-edit $t
a
g"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-09
Junio C Hamano
tag: do
n
ot s
h
ow non-tag contents with "
-
n"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-07
Junio
C Ham
a
no
c
ommit: igno
r
e
inte
n
t-to-a
d
d ent
r
ies inst
e
ad
of
refusing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-07
J
u
nio
C
Hamano
git checkout -b: allow sw
i
tching out o
f
an unbor
n
branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Ju
n
io C Hamano
ma
i
l
map: alw
a
ys return a plain mail address fr
o
m map_us
e
r()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
J
unio C
Hamano
P
r
epare for 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Junio C Hamano
Merge bran
c
h 'sp/smart-http-failure-to
-
push' into m
a
int
commit
|
commitdiff
|
tree
2012-02-06
J
u
nio C Hamano
M
e
rge branch
'
jc/maint-l
o
g-fir
s
t
-
p
a
rent-pathspe
c
' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-06
J
unio C Ha
m
ano
Me
r
ge bra
n
c
h
'
cb/
p
ush-quiet
'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-06
Junio
C
H
a
mano
Me
r
ge b
r
anc
h
'cb/ma
i
nt-kill-subprocess-upo
n
-s
i
gnal
.
.
.
commit
|
commitdiff
|
tree
2012-02-06
Junio C
H
amano
Sy
n
c
w
i
th
1
.
7
.
6
.
6
commit
|
commitdiff
|
tree
2012-02-06
J
unio
C
Hamano
Sync with 1
.
7
.
6
.
6
commit
|
commitdiff
|
tree
2012-02-06
Junio C
H
a
ma
n
o
S
ync wi
t
h 1
.
7
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Jun
i
o C
H
a
mano
Git 1
.
7
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Junio
C Hamano
branch --ed
i
t-description: protect ag
a
inst mistyped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Junio C Hamano
me
r
ge: do not create a s
i
gned tag me
r
ge
und
e
r --ff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-04
Ju
n
io C Haman
o
p
a
rs
e
_
date
(
): '@' prefi
x
forces git-timestam
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-04
Juni
o
C H
a
ma
n
o
parse_date(): allow ancient git-timestamp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-04
Junio
C
H
am
a
no
t
e
sts: add
wr
i
te
_
sc
r
i
p
t helper
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next