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
merge: backport GIT_MERGE_AUTOEDIT support
2012-03-20
Junio C Hamano
merge: bac
k
port GIT_MER
G
E_
A
UTOEDIT support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
i
o C Hamano
Git 1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio
C
Hamano
Mer
g
e
br
a
nch '
t
r/maint-bundle-
b
ound
a
ry'
into main
t
commit
|
commitdiff
|
tree
2012-03-12
J
u
ni
o
C Haman
o
M
e
rge b
r
anch 'jc/ma
i
nt-diff-pat
c
h-header
'
into maint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C Haman
o
M
er
g
e b
r
anch '
j
n/main
t
-do
-
n
o
t-match-with-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C H
a
m
ano
M
e
rge bra
n
ch 'jc/am-3-no
n
standard-pop
t
'
into
m
a
in
t
commit
|
commitdiff
|
tree
2012-03-06
J
unio C Hamano
Merge b
r
anch '
m
a
i
nt-1
.
7
.
8' into maint
commit
|
commitdiff
|
tree
2012-03-06
Jun
i
o C Hama
n
o
Merge
b
r
anch 'maint-1
.
7
.
7' i
n
to
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
Haman
o
Git 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hama
n
o
Merge br
a
n
ch 'jc/doc-merge-options' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge
b
ranch 'cn/
m
aint-rev-list-doc'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Update draf
t
rel
e
ase
not
e
s to 1
.
7
.
9
.
3 for the last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C
H
aman
o
Merge branc
h
'
cn/maint-branch
-
with-b
a
d' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
M
e
r
ge branch 'jn/maint-gitwe
b
-invalid-re
g
e
x
p' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
J
unio C Hamano
Mer
g
e branch 'nd/main
t
-v
e
r
i
fy
-
objects'
into maint
commit
|
commitdiff
|
tree
2012-03-05
J
unio C
H
amano
Merge bra
n
ch 'jk/maint-avoid
-
str
e
aming-f
i
ltered-contents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
J
unio C Hamano
Merge branch 'jb/filt
e
r
-ign
o
re-sigp
i
pe' int
o
maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C
Hamano
Merge branch 'sp/sma
r
t-ht
t
p
-
fail
u
re-to-push' in
t
o
maint
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Hama
n
o
Merge branch 'tr/
m
aint-bun
d
l
e
-long-
s
ubject'
i
n
t
o main
t
commit
|
commitdiff
|
tree
2012-03-02
Junio C Hamano
Do
c
u
m
entatio
n
: do not assume that
n > 1 in <rev>~$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Juni
o
C Hamano
diff -p
:
squ
e
lc
h
"diff --git
"
h
e
ade
r
fo
r
stat-d
i
rty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t4011:
illustrate "di
f
f-index -p"
on stat-dirt
y
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t4
0
11: modern
i
se sty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C
H
amano
Update draft
r
elease notes t
o
1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
i
o
C
Hamano
Merge branch 'pj/remote-set-branches-usage
-
f
ix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hamano
Merge branch
'jn/
g
itweb-unborn-head' int
o
main
t
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge
b
ranch
'
jn/ancie
n
t
-meld-supp
o
rt' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Hamano
Merge
br
a
nc
h
'tr/
m
erge-
e
dit-gui
d
ance' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Ha
m
ano
test: "a
m
-3"
c
an accept
n
o
n
-standard -p<num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
D
ocum
e
nt accumu
l
ated fixes sin
c
e 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C H
a
mano
Merge
branch 'jc/add-ref
r
esh-unmerged' into
m
aint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge branch
'
js/con
f
igure-libintl' i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-02-27
J
unio C Hamano
Sync with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
i
o
C Hamano
Git 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio C Hamano
Document merge
.
branchdes
c
configurat
i
o
n variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Ju
n
i
o
C H
a
mano
am -3:
allow nonst
a
ndard -p<num> option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-23
Junio
C
Hamano
Git 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-22
Junio C
H
amano
Docum
e
ntation/merge-opti
o
ns
.
txt
:
g
r
oup "ff" related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Updat
e
draft
r
eleas
e
notes to
1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-21
J
u
n
io
C
H
amano
Merge
b
r
a
nc
h
'cb/receive-pack-keep-errors' int
o
maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hama
n
o
Merge branch 'cb/transfer-no-
p
r
og
r
ess' into
m
aint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge branch '
j
k/git-dir-
l
o
o
kup'
into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge bra
n
ch 'jc/diff-stat-scaler'
i
n
to maint
commit
|
commitdiff
|
tree
2012-02-21
Ju
n
io C H
a
mano
Merge branch 'zj/
t
erm-columns' int
o
maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C
Hamano
M
erge branch 'cb/mai
n
t
-
rev-list-ver
i
fy-o
b
ject' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
J
unio C Hamano
Merge b
r
a
n
ch 'cb
/
maint-t5541-make-server-port-portabl
e
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Jun
i
o C Hama
n
o
Merge branch 'dp/i18n-libcharset
'
into m
a
int
commit
|
commitdiff
|
tree
2012-02-21
Juni
o
C
H
a
m
ano
Mer
g
e branc
h
'
jk/gre
p
-
b
inary-attribute' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio C Hamano
Merge
b
ranch 'nd/diffstat-gramnum' into maint
commit
|
commitdiff
|
tree
2012-02-21
Junio
C
Hama
n
o
Mer
g
e
branch 'nd/fi
n
d-p
a
ck-entry
-
recen
t
-
cache-
i
nvalidat
i
on
.
.
.
commit
|
commitdiff
|
tree
2012-02-21
Junio C
H
amano
M
e
rg
e
br
a
nch 'tt/p
r
ofile-build-fix' into mai
n
t
commit
|
commitdiff
|
tree
2012-02-21
Junio
C
Ha
m
ano
M
e
rge bran
c
h 'fc/zsh-compl
e
tion' into mai
n
t
commit
|
commitdiff
|
tree
2012-02-20
Junio C Ham
a
no
Update dra
f
t rel
e
ase
n
otes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-17
J
u
nio C H
a
m
a
n
o
refresh_ind
e
x: do not show unmerged pat
h
that is ou
t
side
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
Ju
n
io C H
a
mano
Updat
e
draft release notes to 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-16
J
u
nio C Haman
o
Merge b
r
anch 'j
c
/checkout-out-of-
u
nborn' into maint
commit
|
commitdiff
|
tree
2012-02-16
Juni
o
C Hamano
Merg
e
branc
h
'jc/maint
-
mai
l
map-output' into m
a
int
commit
|
commitdiff
|
tree
2012-02-16
J
unio C Hama
n
o
Merge b
r
an
c
h '
j
k
/prom
p
t-fallba
c
k-to-tty' into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Ha
m
a
n
o
Me
r
ge branch 'jn/git
w
eb-search-
u
t
f
-8' into
maint
commit
|
commitdiff
|
tree
2012-02-16
J
u
n
io C Ha
m
ano
Merge branch 'jc
/
mai
n
t
-
commit-ignore-
i
-t-a' int
o
m
aint
commit
|
commitdiff
|
tree
2012-02-16
Jun
i
o C Hamano
Merge branch
'
m
m
/empty-loose-error-message' into maint
commit
|
commitdiff
|
tree
2012-02-16
J
u
ni
o
C H
a
mano
M
e
rge branch 'nk/ctype-for
-
perf' into main
t
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Merge branch 'jx/i18n-more-marking
'
into maint
commit
|
commitdiff
|
tree
2012-02-16
Junio C Hamano
Merge branch 'rt/co
m
pletion-branch-edit-desc' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-14
Junio C Hamano
diff --stat: show bars
o
f
same
l
e
ng
t
h
for paths with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
Jun
i
o C Hamano
Git 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-14
J
u
nio C Ham
a
no
Merge branc
h
'jk
/
maint-tag-show-fixes' in
t
o maint
commit
|
commitdiff
|
tree
2012-02-14
J
unio C Hamano
Merge
bra
n
ch 'bw/inet-pt
o
n-ntop-compat' int
o
maint
commit
|
commitdiff
|
tree
2012-02-14
Junio
C
Hamano
Mer
g
e
br
a
n
c
h 'mp/make
-
cleanse
-
x-f
o
r-
e
xe' i
n
to maint
commit
|
commitdiff
|
tree
2012-02-14
Junio C Ham
a
no
Merge bra
n
ch 'jn/merge-n
o
-edit-fix'
int
o
maint
commit
|
commitdiff
|
tree
2012-02-13
Junio C Hamano
Update d
r
aft
r
e
lease n
o
t
es
t
o 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-13
Junio
C
Haman
o
Mer
g
e branch 'js/add-e-subm
o
d
u
le-fix' into maint
commit
|
commitdiff
|
tree
2012-02-13
Junio C Ha
m
ano
Merge b
r
a
n
ch 'jc/parse-d
a
t
e
-
r
aw' into maint
commit
|
commitdiff
|
tree
2012-02-13
Junio C H
a
mano
Merge bran
c
h 'jc/merge-ff-
o
nly-stronger-tha
n
-signed
.
.
.
commit
|
commitdiff
|
tree
2012-02-13
Junio C
Ham
a
no
Merge branch 'jc/
b
ra
n
c
h-desc-typoav
o
idance' into maint
commit
|
commitdiff
|
tree
2012-02-13
Junio C Hamano
Me
r
ge branch 'jn/rpm-spec'
into m
a
int
commit
|
commitdiff
|
tree
2012-02-10
J
unio C Hamano
Update
d
raft rele
a
se notes to 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-10
J
u
n
i
o C Hamano
Merge branch 'jc/maint-reque
s
t-pull-for-tag'
into maint
commit
|
commitdiff
|
tree
2012-02-10
Junio C
Hamano
Merge branc
h
'tr/
g
rep-
l
-
with-decoration' int
o
maint
commit
|
commitdiff
|
tree
2012-02-10
Junio
C
Hamano
Merg
e
b
r
anch 'jl
/
s
u
b
module-re-ad
d
' into maint
commit
|
commitdiff
|
tree
2012-02-10
Junio
C
H
amano
Mer
g
e branch
'
da/
m
aint-mergetool-t
w
o
way'
i
n
to maint
commit
|
commitdiff
|
tree
2012-02-09
Jun
i
o C
Ham
a
n
o
merge:
d
o not l
a
unch an
e
ditor on "--no-edit $tag"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-09
Junio
C
Hamano
tag: do not
s
how
n
on
-
tag contents
with "
-
n
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-07
Ju
n
io C Haman
o
commi
t
: ignor
e
intent-to-
a
dd ent
r
ies inste
a
d of refusin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-07
Junio C Hamano
git c
h
eckout -
b
: al
l
o
w swit
c
hing out
of
a
n
unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Junio
C
Hamano
mailmap: alway
s
return a p
l
ain
m
a
il address from map_user
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
J
u
nio
C Hamano
P
re
p
ar
e
for 1
.
7
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Junio C Hamano
Merg
e
branch
'
sp/
s
mart-
h
ttp-
f
ailu
r
e-to-p
u
sh' into m
a
int
commit
|
commitdiff
|
tree
2012-02-06
Junio C Haman
o
Merge branch '
j
c/maint-l
o
g-firs
t
-parent-pat
h
spec' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-06
Junio C
H
amano
Merge branch 'c
b
/
p
us
h
-quie
t
' int
o
maint
commit
|
commitdiff
|
tree
2012-02-06
Jun
i
o C Hamano
Merg
e
branch 'cb/maint-kill-subprocess-upon-signal
.
.
.
commit
|
commitdiff
|
tree
2012-02-06
Junio C Ham
a
no
S
ync with 1
.
7
.
6
.
6
commit
|
commitdiff
|
tree
2012-02-06
Junio C Haman
o
Sync with
1
.
7
.
6
.
6
commit
|
commitdiff
|
tree
2012-02-06
Junio C Ham
a
no
S
y
nc with 1
.
7
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Junio C
H
amano
Gi
t
1
.
7
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Junio C Hamano
branch --edit
-
description
:
prote
c
t against mistyped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-06
Ju
n
i
o C H
a
mano
merge: do
not crea
t
e a
si
g
ned tag merge
u
nder --ff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-04
Junio C H
a
mano
parse_dat
e
(): '@
'
prefix forces
g
it-timestamp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-04
Junio
C
Ham
a
no
parse_date(): al
l
ow
ancient git-times
t
amp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-04
Junio C Haman
o
tes
t
s: add
w
rite_scrip
t
h
e
lper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next