repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Show error for 'git merge' with unset merge.defaultToUpstream
2011-11-21
Vinc
e
nt
v
an Raves
t
eijn
Sh
o
w error f
o
r 'git
merge' w
i
th uns
e
t mer
g
e
.
defaultToUpstream
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-18
Ju
n
io C Hamano
Git 1
.
7
.
7
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-18
Juni
o
C H
a
mano
Merge branch 'jc/maint-n
a
m
e-rev-all' into maint
commit
|
commitdiff
|
tree
2011-11-18
Junio C Hamano
Merge branch 'ml/mailm
a
p
' in
t
o maint
commit
|
commitdiff
|
tree
2011-11-18
Junio C H
a
ma
n
o
Merge
branch 'jn/maint-notes
-
a
void-va-
a
rgs
'
into maint
commit
|
commitdiff
|
tree
2011-11-18
Jonathan
N
ieder
Makefi
l
e: add
m
issing header file depen
d
en
c
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-18
Jonathan Nieder
notes merge: eliminate
O
UTPUT macro
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-17
Marc-André L
u
reau
mail
m
ap
:
xcallo
c
m
ailma
p
_info
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-15
Jun
i
o
C Hamano
name-rev --all: d
o
not
e
ven
attempt to de
s
cribe n
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-09
Ju
n
io C Hamano
Git
1
.
7
.
7
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-09
J
un
i
o C Hamano
Me
r
ge branch 'jc/maint-remove-
r
enamed-
r
ef' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-11-09
Jun
i
o C Hamano
Merge branch
'jm/maint-gitweb-
f
il
t
er-f
o
rk
s
-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-11-09
J
un
i
o
C Hamano
Merge branch
'dm/pack-o
b
jects-update' into m
a
int
commit
|
commitdiff
|
tree
2011-11-08
J
unio C Hamano
docs
:
Update ins
t
al
l
-d
o
c-quick
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-08
J
e
f
f
Ki
n
g
docs:
don't mention --
q
uie
t
or
-
-exit-code in g
i
t-log(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-01
Junio C
Hamano
Git 1
.
7
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-01
Ju
n
io C Ham
a
no
Mer
g
e branc
h
'
r
s/mai
n
t-estimate-cache-si
z
e'
i
nto maint
commit
|
commitdiff
|
tree
2011-11-01
Juni
o
C Ham
a
no
Me
r
ge
branch 'md/smtp-tls-hello-aga
i
n' into maint
commit
|
commitdiff
|
tree
2011-11-01
Ju
n
io C Hamano
Merge branch 'jk
/
p
ull-reb
a
s
e
-with-work-tree' into maint
commit
|
commitdiff
|
tree
2011-11-01
Ju
n
io C Hama
n
o
Merge bra
n
ch 'jc/maint-dif
f
sta
t
-
n
umst
a
t-cont
e
x
t' into
.
.
.
commit
|
commitdiff
|
tree
2011-11-01
J
unio C H
a
mano
Merge bran
c
h 'js
/
bisect-
n
o
-
checkout' into
maint
commit
|
commitdiff
|
tree
2011-11-01
Junio C Hama
n
o
Me
r
ge branch '
b
c/attr-i
g
no
r
e-case' in
t
o maint
commit
|
commitdiff
|
tree
2011-11-01
Ju
n
io
C Haman
o
Merge branch '
c
n/fetch-pr
u
ne' int
o
maint
commit
|
commitdiff
|
tree
2011-11-01
Jun
i
o C H
a
ma
n
o
Merge bran
c
h 'sp
/
s
m
art-http-fa
i
l
ure'
i
nto maint
commit
|
commitdiff
|
tree
2011-11-01
Juni
o
C Ha
m
ano
Merge
j
n/m
a
int-http-error-message
commit
|
commitdiff
|
tree
2011-10-31
Pat T
h
oyts
t7511:
avo
i
d
us
e
of reserved file
n
ame on Windows
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-27
Junio
C
Hamano
M
erge
b
ranch 'rs/
m
aint-estimate-cach
e
-
s
ize' i
n
to maint
commit
|
commitdiff
|
tree
2011-10-27
Rich
a
rd H
a
rtmann
c
lone: Quote user suppl
i
ed
path in a si
n
g
le quote pair
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-26
J
unio C Hamano
Merg
e
branch 'j
n
/gitwe
b
-
h
ighlite-sanitis
e
' into maint
commit
|
commitdiff
|
tree
2011-10-26
Juni
o
C Hamano
M
erg
e
b
r
anch 'j
k
/argv-array' into maint
commit
|
commitdiff
|
tree
2011-10-26
Ju
n
io C Hamano
Me
r
ge branch 'jc/run-re
c
e
ive-hoo
k
-cleanup' into m
a
int
commit
|
commitdiff
|
tree
2011-10-26
Junio C Hamano
Merge branch 'cn/
e
radi
c
ate-wo
r
king-copy' into maint
commit
|
commitdiff
|
tree
2011-10-26
Junio
C
Hamano
Merg
e
branc
h
'maint-1
.
7
.
6' in
t
o main
t
commit
|
commitdiff
|
tree
2011-10-26
Ju
n
io C Hamano
M
erg
e
b
ranch 'm
h
/maint-notes-m
e
rge-p
a
thb
u
f
-
fix
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-10-26
J
u
nio C
H
a
mano
Merge branch 'ps/gitweb-js-w
i
th-l
i
neno' into main
t
.
.
.
commit
|
commitdiff
|
tree
2011-10-26
Junio C Hama
n
o
Merge branch 'jm/m
e
rgeto
o
l-pathspe
c
' in
t
o
m
aint-1
.
7
.
6
commit
|
commitdiff
|
tree
2011-10-26
J
u
n
i
o C H
a
mano
Mer
g
e br
a
nch 'mz/r
e
mote
-
ren
a
m
e
'
into
m
aint-1
.
7
.
6
commit
|
commitdiff
|
tree
2011-10-26
Junio C
H
amano
Merge branch 'rj/
m
aint-t9159
-
svn-rev-
n
otation' into
.
.
.
commit
|
commitdiff
|
tree
2011-10-26
Jun
i
o
C Hamano
Merge
bra
n
c
h
'
hl/iso8601-m
o
re-zone-formats
'
i
nt
o
main
t
.
.
.
commit
|
commitdiff
|
tree
2011-10-26
Junio C Ha
m
ano
Merge branc
h
'maint-1
.
7
.
6'
into main
t
commit
|
commitdiff
|
tree
2011-10-26
Junio
C Hamano
M
e
rge branch 'tr/doc
-
note-rewrite' int
o
m
ain
t
-1
.
7
.
6
commit
|
commitdiff
|
tree
2011-10-26
Junio
C
Hamano
Me
r
ge branch '
n
d/sparse-doc'
i
nto
m
a
int-
1
.
7
.
6
commit
|
commitdiff
|
tree
2011-10-26
Junio C Ha
m
ano
Me
r
ge branc
h
'mg/maint-
d
oc-sparse-checkout' into m
a
i
nt
.
.
.
commit
|
commitdiff
|
tree
2011-10-26
Junio C Hamano
Merge
b
r
a
n
c
h
'
m
a
int-1
.
7
.
5' int
o
m
a
int-1
.
7
.
6
commit
|
commitdiff
|
tree
2011-10-26
Junio C Hamano
Merge bran
c
h 'maint-1
.
7
.
4'
i
n
t
o maint-1
.
7
.
5
commit
|
commitdiff
|
tree
2011-10-26
Junio C H
a
mano
M
e
r
ge bra
n
ch 'maint-1
.
7
.
3' into mai
n
t
-1
.
7
.
4
commit
|
commitdiff
|
tree
2011-10-26
Junio
C
Ham
a
no
Mer
g
e branch 'sn
/
do
c
-update-
i
ndex-a
s
sume-unch
a
n
ged
.
.
.
commit
|
commitdiff
|
tree
2011-10-26
Ren
é
Scharfe
r
ead-
c
ache
.
c
:
fix i
n
dex memory
a
l
l
ocation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-26
J
i
m
Me
y
ering
m
ake the sample pre-co
m
mit ho
o
k scr
i
pt reject names
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-24
J
u
nio C Hamano
Merge bra
n
c
h
'm
a
int-1
.
7
.
3' into mai
n
t
commit
|
commitdiff
|
tree
2011-10-24
Ngu
y
ễn
Thái Ngọc Duy
Reinden
t
cl
o
s
ing bracket us
i
ng tab instead of spaces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-24
Junio C Hamano
Git 1
.
7
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-24
J
onathan N
i
eder
RelNotes/1
.
7
.
7
.
1:
setgid
bit patch
is a
b
out fixing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-21
J
u
lien M
u
chembl
e
d
gitweb:
fix regress
i
o
n when filt
e
ring out
f
orks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-21
Jun
i
o C Hamano
Almost
r
eady
fo
r
1
.
7
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-21
Junio
C
Hamano
Merg
e
branch 'nd/maint-
a
utofix-ta
g
-in-head' into ma
i
nt
commit
|
commitdiff
|
tree
2011-10-21
Junio C Hamano
M
erge branc
h
'jc/apply-blank
-
at-eof-fix' into maint
commit
|
commitdiff
|
tree
2011-10-21
Junio C Hamano
Merge
b
ranch
'jn/n
o
-g-plus-s-on-bs
d
' into m
a
int
commit
|
commitdiff
|
tree
2011-10-21
Junio C Hamano
M
e
r
ge branch 'rs/di
f
f-cle
a
nup-rec
o
rds
-
f
ix
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-10-21
Junio
C Haman
o
Merge
b
r
an
c
h 'il/
a
r
c
h
i
v
e-er
r
-signal
'
into maint
commit
|
commitdiff
|
tree
2011-10-21
Junio C H
a
m
a
n
o
Merge branch
'
js/ma
i
nt-merge-one-file
-
osx-expr' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-10-21
Junio C Hamano
Merge branc
h
'jm/maint-apply-
d
etect
s
-cor
r
u
pt-pa
t
ch
.
.
.
commit
|
commitdiff
|
tree
2011-10-21
Junio C H
a
ma
n
o
Me
r
g
e
branc
h
'jc/ch
e
c
k
out-fr
o
m-tr
e
e
-
k
eep-local
-
cha
n
ges
.
.
.
commit
|
commitdiff
|
tree
2011-10-21
Junio
C
Ham
a
no
Merge branch 'mm/maint-c
o
nfig-expli
c
it-boo
l
-display
.
.
.
commit
|
commitdiff
|
tree
2011-10-21
Dan McGee
pack-objects: d
o
n't t
r
averse objec
t
s unnece
s
sarily
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-18
Brandon Casey
st
r
bu
f
.
c:
remove unnecessary
s
trbuf_gro
w
() from strb
u
f_ge
t
w
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-18
Dan M
c
G
e
e
p
a
c
k-object
s
: rewrite
add_descendants_t
o
_write_ord
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-18
Dan McGee
p
a
ck-objects:
use
u
nsigne
d
i
n
t f
o
r coun
t
e
r and o
f
fse
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-18
Dan M
c
Gee
pack-objects: mark add_to_write_or
d
er() as inline
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
C
arlos Martín N
i
eto
fe
t
c
h
: treat --t
a
gs l
i
ke refs/tags/*:ref
s
/tags/
*
when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Carlos M
a
rt
í
n Niet
o
fetch: h
o
nor the u
s
er-provid
e
d
refspecs when pruning
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Car
l
os
M
artín Nieto
remote:
s
ep
a
rate out the remote_find_tracki
n
g
l
ogi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Ha
m
ano
Prepa
r
e for
1
.
7
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
M
e
rge branch '
m
s/patch-id-with-overlong-line' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
J
u
n
io C Hamano
Merge
branch 'j
c
/mai
n
t-
b
un
d
le-too-quie
t
' into main
t
commit
|
commitdiff
|
tree
2011-10-16
Junio C Hamano
M
e
rge branch 'jk/filter-branch-req
u
ire-cl
e
an-work-tree
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Ju
n
io C Hamano
Merg
e
bran
c
h 'jc/maint-fsck-fwrite-s
i
ze-check' into
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Jun
i
o C Hamano
Me
r
ge branch
'
bk/
a
ncestry-
p
ath' into maint
commit
|
commitdiff
|
tree
2011-10-16
Junio
C Hama
n
o
Merge br
a
nch 'jk/m
a
int-fetch-su
b
module-
c
heck-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-10-16
Junio C
Ham
a
n
o
Me
r
ge branch 't
r
/mergetool-valgrind
'
into maint
commit
|
commitdiff
|
tree
2011-10-16
J
u
nio C Hamano
M
e
rge branch 'nm
/
grep-object-sha
1
-l
o
ck' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-10-16
J
u
nio C Hamano
Merg
e
br
a
nch 'jc/diff
-
i
ndex-unpac
k
'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-10-16
Ju
n
i
o
C Hamano
Merge branch 'mm/rebase-i-
e
xec-e
d
it' into maint
commit
|
commitdiff
|
tree
2011-10-16
Mat
t
hew Daley
s
e
n
d-e
m
a
i
l:
H
onour
S
MT
P
domain when
u
sing T
L
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-14
René Scharfe
t
1304:
f
all back to $USER if $LOGNAME
is
n
o
t
defi
n
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-13
J
e
ff King
pull,rebase: hand
l
e GIT_WORK_TREE better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-12
J
im
Me
y
ering
fix "
g
it app
l
y --index
.
.
.
"
not to d
e
ref NULL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-12
Junio C Ha
m
ano
b
ranch
-
m
/-M: rem
o
ve un
d
ocumented RENAMED
-
REF
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-11
Bran
d
o
n Casey
attr
.
c
:
respect c
o
re
.
ignorec
a
se when
m
atc
h
ing attrib
u
te
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-10
Ma
t
thieu Moy
con
f
ig: display key_delim f
o
r config
-
-bool --get
-
reg
e
xp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-07
Carlos Martín Nieto
t
5
510: add t
e
sts for fetch
-
-prune
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-07
Carlos
M
artín N
i
eto
fe
t
ch
:
free all the additional refspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-06
J
u
n
io C Ha
m
ano
att
r
: read
c
or
e
.
attribut
e
sfile from git_defau
l
t_core_config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-06
B
r
andon Casey
builtin/mv
.
c: plug
m
iniscule
m
emo
r
y leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-06
Brandon Casey
cleanu
p
: use internal memory allo
c
a
t
ion wrapper functions
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-06
Bra
n
don Casey
attr
.
c
:
a
v
oid inappropriate ac
c
e
ss to
strbuf "
b
uf"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-06
Jay Soffian
mer
g
e
-
one-file: fix "e
x
pr: non-n
u
me
r
i
c argume
n
t"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-05
Ilari Liusvaara
Suppor
t
ERR in r
e
m
o
te archive
l
ike
in fetch
/
push
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-05
Shawn O
.
Pearce
remote-curl:
F
ix war
n
ing after HTTP failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-10-03
Jon
a
than Nieder
Makefile: do no
t
se
t
set
g
id bit
o
n directories on G
N
U
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next