repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge: force edit and no-ff mode when merging a tag object
2011-11-09
Junio C Hamano
merge:
for
c
e edit and
no-f
f
mod
e
when merging
a tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-09
Junio C H
a
mano
c
ommit: copy merged si
g
n
e
d
tags to heade
r
s of me
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-08
Junio C Ham
a
no
merge: record tag object
s
without pee
l
ing
in MERGE_HEAD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-08
Junio C Haman
o
merge: make usage o
f
commit->util more extens
i
ble
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-08
Junio C Hama
n
o
fmt-merge-
m
s
g
: Ad
d
content
s
of merged tag in the merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-07
Junio C Hamano
fmt-me
r
g
e-msg: package options into a stru
c
ture
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-07
Ju
n
i
o
C Hamano
f
mt-
m
erge-msg: avoid early returns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-07
Junio C Ham
a
no
refs DW
I
M
m
e
r
y: u
s
e the
same rule for
b
oth "git fetch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-07
Junio C Hama
n
o
fetch: allow "git fe
t
c
h
$there v1
.
0" to
fet
c
h
a
tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-07
Junio C Hamano
merge:
notice loc
a
l merging
o
f
tag
s
and ke
e
p i
t
unwrapp
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-05
Linus Torvalds
fetch: d
o
not store peel
e
d tag
object names in
F
ETCH_HEAD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-05
J
u
ni
o
C Hama
n
o
Split GPG i
n
terfac
e
into its own
helper libr
a
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hamano
Merge branch 'js/merge-edit-option'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Ha
m
ano
Merge branch
'rs/diff-whole-f
u
nct
i
on
'
commit
|
commitdiff
|
tree
2011-10-19
J
unio
C
H
aman
o
Merge branch 'rs
/
pi
c
k
a
xe
'
commit
|
commitdiff
|
tree
2011-10-19
J
u
nio C Hama
n
o
M
erge branch 'js/no-cherr
y
-pick-head-afte
r
-
p
unted'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hamano
Me
r
ge branch 'bk/submodule-in-recursive-mer
g
e'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hamano
Merge
b
ranch 'jm/ma
i
nt
-
appl
y
-detect
s
-cor
r
upt-pat
c
h
.
.
.
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hamano
Me
r
ge branch 'jk/
c
onfig-test-cleanup'
commit
|
commitdiff
|
tree
2011-10-19
Johannes Sixt
t1300:
a
t
t
empting to remov
e
a non-existent
.
git/config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hamano
Merge bran
c
h 'js/
l
og-show
-
children'
commit
|
commitdiff
|
tree
2011-10-19
Junio C Hamano
M
e
rge branch 'cb/ht
t
p
d
-
test-fix-p
o
r
t'
commit
|
commitdiff
|
tree
2011-10-19
Junio
C
Ham
a
n
o
M
e
r
ge branch 'jn/gi
t
web-m
a
n
pages'
commit
|
commitdiff
|
tree
2011-10-19
J
u
nio C Hamano
Merge branch 'p
t
/mingw-misc-fixes'
commit
|
commitdiff
|
tree
2011-10-19
J
u
nio C Hamano
Merge
b
ranch 'md/smtp-tl
s
-hello-
a
gain'
commit
|
commitdiff
|
tree
2011-10-19
Jun
i
o
C
Hamano
Mer
g
e branc
h
'maint'
commit
|
commitdiff
|
tree
2011-10-18
Brandon Casey
s
t
r
b
uf
.
c: remove
u
nnecessary s
t
rbuf_grow() fro
m
strbuf_
g
etwh
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-18
J
unio C Hamano
Update
draft re
l
ea
s
e notes to
1
.
7
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-18
J
u
nio C Hama
n
o
Merge branch '
j
k/h
t
tp-a
u
th'
commit
|
commitdiff
|
tree
2011-10-18
J
u
ni
o
C
Hamano
Merge
branch 'js/check
-
ref-
f
ormat-tes
t
-mingw'
commit
|
commitdiff
|
tree
2011-10-18
Jun
i
o C Haman
o
Merge bran
c
h
'jk/pull-rebase-wit
h
-wo
r
k
-
tree'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
Merge bran
c
h 'jk/config-test-cleanup'
commit
|
commitdiff
|
tree
2011-10-18
Junio
C
Hamano
Merg
e
bran
c
h
'
bc/attr-ignore-
c
ase'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Hamano
Me
r
g
e branch 'sg/com
p
letio
n
'
commit
|
commitdiff
|
tree
2011-10-18
Junio C Ham
a
no
Me
r
ge b
r
a
n
ch
'
mm
/
maint-config-e
x
p
l
i
cit-bool-
d
isplay
'
commit
|
commitdiff
|
tree
2011-10-18
Junio C H
a
mano
M
e
r
g
e bran
c
h
'tc/fetch
-
leak'
commit
|
commitdiff
|
tree
2011-10-18
Junio C
H
amano
Merge
b
r
anch
'jk
/
name-
h
a
s
h-
d
irent'
commit
|
commitdiff
|
tree
2011-10-18
Junio
C
Ha
m
ano
Me
r
g
e branch 'ef/mi
n
gw-syslog'
commit
|
commitdiff
|
tree
2011-10-18
Junio
C Hamano
Merge b
r
anch 'tm/c
o
mpletion-push-se
t
-upstream'
commit
|
commitdiff
|
tree
2011-10-18
J
u
nio
C
Hama
n
o
Merge branch 'tm
/
co
m
pleti
o
n-commit-fixup-sq
u
ash
'
commit
|
commitdiff
|
tree
2011-10-18
Junio C
H
aman
o
Merge bran
c
h 'ph/push-to-d
e
l
e
te-noth
i
ng'
commit
|
commitdiff
|
tree
2011-10-18
Junio
C
Hamano
Me
r
ge
b
ranch 'jc/che
c
kout-from-
t
ree-
k
e
e
p-local-changes'
commit
|
commitdiff
|
tree
2011-10-18
J
u
nio C Ha
m
ano
M
e
rge
branch
'
js
/
b
isect-no-ch
e
ck
o
ut'
commit
|
commitdiff
|
tree
2011-10-17
Cleme
n
s
B
uch
a
cher
use tes
t
number a
s
po
r
t num
b
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-17
Junio C Hamano
r
e
s
olve_gitlink_packed_ref(): fix
mism
e
r
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Jakub Narebski
gitweb: Add gitweb ma
n
page
s
to 'gitweb' pa
c
kage
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Jakub Narebski
Do
c
u
m
entation: Add g
i
tweb config varia
b
les to gi
t
-config(
1
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
J
akub
N
arebsk
i
Documentatio
n
: Lin
k
t
o gitweb(
1
) and g
i
tweb
.
conf
(
5
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Jak
u
b N
a
rebski
gitweb: A
d
d gitweb(1
)
m
anpa
g
e for gitw
e
b itse
l
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Dre
w
N
o
rthu
p
g
itweb: A
d
d gitweb
.
c
onf(5)
m
anpage for gitweb
co
n
fig
u
ration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Junio C H
a
mano
U
p
date draft release
note
s
to 1
.
7
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Jun
i
o
C Ha
m
ano
Mer
g
e git:
/
/repo
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2011-10-16
Jef
f
King
ht
t
p
_init: accep
t
separate URL parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Mi
c
hael J Gruber
h
t
tp: use
h
ostname in
credential desc
r
iption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Ju
n
io
C
Hama
n
o
Sync with maint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
J
u
nio
C
H
a
mano
Prepare for 1
.
7
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merge b
r
anch 'ms/patch
-
i
d
-w
i
t
h-o
v
erlong-line' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Ju
n
io C Hama
n
o
Merge branch 'jc
/
m
a
int
-
bundle-too-quiet' into maint
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merge bra
n
ch 'jk/filter
-
branch-requi
r
e-clean
-
work-t
r
ee
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
Merge
b
ra
n
ch 'jc/maint-fsck-fwr
i
te-size-check'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C Ham
a
no
Merge bra
n
ch 'bk/an
c
es
t
r
y
-path
'
into
m
aint
commit
|
commitdiff
|
tree
2011-10-16
Ju
n
i
o C Hamano
Merge br
a
nch 'jk/
m
aint-fetch-subm
o
du
l
e
-
che
c
k-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C
H
amano
Mer
g
e bran
c
h 'tr/merge
t
ool-valg
r
ind' into m
a
int
commit
|
commitdiff
|
tree
2011-10-16
Junio C Ha
m
ano
Merge br
a
nch '
n
m/gre
p
-object-sha1-lock' into
maint
commit
|
commitdiff
|
tree
2011-10-16
J
u
n
io C Hama
n
o
Merge
branch
'
j
c
/dif
f
-index-unpa
c
k' into maint
commit
|
commitdiff
|
tree
2011-10-16
Jun
i
o C Hamano
Merge
bra
n
c
h
'mm/reb
a
se-i-exec-edit' into
maint
commit
|
commitdiff
|
tree
2011-10-16
Matthew
D
a
l
ey
send-email:
H
onour SMTP domain when us
i
ng TLS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
J
u
nio
C
Haman
o
Merge
branch 'jc/g
r
ep-untracked-exclude'
commit
|
commitdiff
|
tree
2011-10-16
Junio C
H
amano
Merge branch 'jc/maint-gr
e
p
-untracked-
e
xclude'
into
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Be
r
t Wesarg
gr
e
p: fix
t
h
e
er
r
or
messag
e
that menti
o
n
s
-
-exclude
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
P
a
t Thoyts
t990
1
: fix line-ending dependency on wind
o
w
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Pat Tho
y
ts
mingw: ensur
e
sockets are ini
t
ialized before calling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Pat Thoy
t
s
merget
o
ol
s
: use the
c
orrect tool for Be
y
ond
Comp
a
re
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-15
Johannes Schindelin
t9
3
00: do not run --c
a
t-blob-fd re
l
at
e
d
t
e
sts o
n
MinGW
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-15
Sebast
i
an Schuberth
git-sv
n
:
O
n
MSYS, escape a
n
d q
u
ote S
V
N
_
SSH also if
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-15
Johannes Schin
d
eli
n
t9001: do not fail
o
nly d
u
e to CR/LF issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-15
Joh
a
nnes Schin
d
elin
t
1
0
20: disable the pw
d
test on MinGW
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-14
Cord Seele
send-email: Fix
%
config_pat
h
_settings handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-14
Junio
C
Haman
o
Merge
b
ra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-10-14
René
Scha
r
fe
t1304: fa
l
l
b
a
ck to
$USER if $LOGNAME is
n
o
t defi
n
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-14
Jun
i
o
C Hamano
Update dr
a
f
t
release notes to 1
.
7
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-14
Junio C
H
amano
Me
r
ge
b
ranch 'js/maint-me
r
ge-one-file
-
o
s
x-ex
p
r'
commit
|
commitdiff
|
tree
2011-10-14
Junio C
Hamano
Merge branc
h
'jn/ident-f
r
om-etc-mailname'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Merge branch '
i
l/arc
h
ive-err-signal'
commit
|
commitdiff
|
tree
2011-10-14
Junio
C Ha
m
ano
Mer
g
e branch
'j
c
/
g
rep-untra
c
ked-exc
l
u
d
e'
commit
|
commitdiff
|
tree
2011-10-14
Ju
n
i
o C Hama
n
o
M
e
r
ge
b
r
a
n
ch 'rs/diff-cleanup
-
records-fix
'
commit
|
commitdiff
|
tree
2011-10-14
Junio C
Hamano
Merge branc
h
'
r
s/pending'
commit
|
commitdiff
|
tree
2011-10-14
J
u
nio C
Hamano
Merg
e
branch 'jn/no-
g
-plu
s
-s-on-bsd'
commit
|
commitdiff
|
tree
2011-10-14
Junio
C
Hamano
M
e
rge
branch 'jc/is-u
r
l-
s
implify'
commit
|
commitdiff
|
tree
2011-10-14
Ju
n
io
C Hama
n
o
Merge branch '
n
d
/
git-daem
o
n-error-m
s
gs'
commit
|
commitdiff
|
tree
2011-10-14
Junio C
H
amano
Me
r
ge branch 'nd/da
e
mon-l
o
g-s
o
ck-e
r
rors'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hamano
Merge bra
n
ch 'cp/git-
w
eb-b
r
ow
s
e-browse
r
s'
commit
|
commitdiff
|
tree
2011-10-14
Junio C Hama
n
o
Merg
e
branch
'
jc/apply-b
l
ank-at-eof-fix'
commit
|
commitdiff
|
tree
2011-10-14
Ju
n
io C Hamano
Mer
g
e branc
h
'di/fast-import-empty-tag-
n
o
t
e-fi
x
'
commit
|
commitdiff
|
tree
2011-10-14
Junio C
Hamano
Mer
g
e b
r
anch 'nd/maint
-
autofi
x
-tag-i
n
-head
'
commit
|
commitdiff
|
tree
2011-10-14
Junio C H
a
mano
Merge branch 'b
w
/grep-
n
o-i
n
dex-no-e
x
clude'
commit
|
commitdiff
|
tree
2011-10-14
Junio
C
Hamano
M
e
rg
e
b
r
anch '
n
d/ma
i
nt-sp
a
r
s
e-er
r
ors'
commit
|
commitdiff
|
tree
2011-10-13
Johann
e
s S
i
xt
t
1402-check-r
e
f-form
a
t:
skip tes
t
s of refs
begi
n
n
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-13
J
eff King
pull
,
rebase: handl
e
GIT_WORK_TREE bett
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-13
Brad King
submodule: Searc
h
for merges only
at end of re
c
ursiv
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next