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
Which merge_file() function do you mean?
2012-12-10
Junio C H
a
mano
Which merge_fil
e
() function do you
mea
n
?
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-04
Juni
o
C Hamano
Merge br
a
nch 'mm/status-push-pull
-
advis
e
'
commit
|
commitdiff
|
tree
2012-12-03
Junio C
Hamano
Gi
t
1
.
8
.
1-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-03
Junio C H
a
mano
Merge
b
ranch 'mm/status-push-p
u
l
l
-advise'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Hamano
Update
draft rele
a
se notes to 1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'pw/p4-vari
o
us-fixes'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ha
m
ano
Merge
b
ranch 'lt/diff-stat-show-0-lines'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hama
n
o
Merge branch
'
fc/remote-hg'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C Ha
m
ano
Merge
b
ranch 'mk
/
complete-t
c
sh'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
M
erge branch 'jc/do
c
-push-satell
i
te'
commit
|
commitdiff
|
tree
2012-11-29
J
unio
C Hamano
Merge branch 'km/send
-
em
a
il-remove-cruft-in-ad
d
ress'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'jk
/
sen
d
-
email
-
sender-prompt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'fc/sen
d
-
e
m
a
il-no-sender-p
r
ompt
'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
H
amano
M
e
rge branch 'er/doc
-
add-new-commands'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C Ha
m
a
n
o
Mer
g
e
branc
h
'jl/submodul
e
-rm
'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o
C Hamano
Me
r
ge branch 'p
p
/g
i
t
web-co
n
fig-und
e
rscore'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C Hamano
M
erge
b
ranch
'
fc/compl
e
tion-test-simplificati
o
n'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C Hama
n
o
Merge branc
h
'ma
s
t
e
r' o
f
git://github
.
com/git
-
l
10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Hamano
t4049: refocus tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge bran
c
h 'mas
t
er' of
g
i
t:/
/
github
.
com/git-
l
10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
Hamano
Merge b
r
anch 'mai
n
t
'
commit
|
commitdiff
|
tree
2012-11-28
J
u
nio C Hamano
Upda
t
e
draft releas
e
notes to 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o C Ha
m
ano
Merge b
r
anc
h
'fc/zsh-
c
ompletion
'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Mer
g
e branch 'mm/status-pus
h
-
pul
l
-a
d
vise
'
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o
C
Hamano
Merge bra
n
ch 'jk/pickaxe-te
x
tconv'
commit
|
commitdiff
|
tree
2012-11-28
J
unio
C Hamano
Start
preparing for 1
.
8
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Juni
o
C Ha
m
ano
Merge
bra
n
ch 'rh/maint-gitweb-highlig
h
t-
e
xt
'
into maint
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hama
n
o
M
erge branch
'
p
w/maint-p4-rc
s
-expansion-new
l
i
n
e' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
H
a
mano
Merge branch 'fc/send-em
a
il-no-sender-
p
rompt' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
Ham
a
no
Do
c
umen
t
a
tion/git
-
push
.
txt: clarify the "pus
h
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
J
u
nio C
H
a
man
o
diff --shortstat: do n
o
t count "unmerged" entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Merge
b
r
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2012-11-27
Junio C
H
ama
n
o
M
e
rge br
a
nch 'nd/maint-compa
t
-fnmatch-fix' i
n
to maint
commit
|
commitdiff
|
tree
2012-11-27
Junio
C
H
a
mano
Merge br
a
nch 'jh
/
upda
t
e-ref
-
d
-
throu
g
h-symref' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Junio
C H
a
mano
Merge branch 'esr/maint-
d
o
c
-fast-import' into maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C
H
a
mano
Merge
b
ranch 'wtk/s
u
bmodule
-
do
c
-fixup' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-11-27
Junio C
H
a
mano
d
i
f
f
-
-s
t
at
:
d
o
not
c
ount "unmerge
d
"
en
t
ries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C Haman
o
diff --
s
tat: move the
"
total count" logic to the last
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o
C Hamano
diff --stat: use "file
"
tempora
r
y
v
ariable to refer
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Juni
o
C Hamano
dif
f
--sta
t
: s
t
atu
s
of u
n
m
od
i
f
ied pair in diff-q
i
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
test: add failing tests for "diff --st
a
t" to t4049
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Hamano
U
p
date draft relea
s
e
n
ot
e
s to 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Hamano
Mer
g
e branc
h
'rr/submodule-d
i
ff-config'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
M
e
rge branch 'nd/maint-compat-fnm
a
tch-
f
ix'
commit
|
commitdiff
|
tree
2012-11-26
J
u
n
i
o
C
Ha
m
ano
Merge
b
ran
c
h
'bc/do-not-re
c
urse-in-die
'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C Hamano
Merge
b
ra
n
c
h
'mk/comple
t
e-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Hamano
Me
r
ge
b
r
anch 'j
h
/
u
pd
a
te-ref
-
d-
t
hrough-symref'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
Hamano
Merge branch 'lt
/
diff-stat-show-0-lines'
commit
|
commitdiff
|
tree
2012-11-26
J
uni
o
C Hamano
M
erge branch 'sg/complete-he
l
p-undup'
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio
C Hama
n
o
Sync with 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
J
unio C
H
amano
Git 1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch 'j
k
/c
h
eckout-out-o
f
-unb
o
r
n' into maint
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
Hama
n
o
Merge branch '
c
n/config-mi
s
sing-pat
h
' into maint
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge br
a
nch 'jk/
m
aint-gitweb-xss' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-11-21
Juni
o
C Hamano
Upda
t
e draft rele
a
se notes
f
or 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-21
Junio C H
a
ma
n
o
Mer
g
e branch 'e
s
r/maint
-
doc-fast-i
m
port
'
commit
|
commitdiff
|
tree
2012-11-21
Junio C H
a
mano
Merge b
r
anch 'wt
k
/
submod
u
le-doc-fixup'
commit
|
commitdiff
|
tree
2012-11-21
Junio C
H
amano
Merge branch '
s
o
/
p
rom
p
t-comm
a
nd'
commit
|
commitdiff
|
tree
2012-11-21
J
u
nio C Hama
n
o
M
erge branch 'jk/config-ignore-duplicates
'
commit
|
commitdiff
|
tree
2012-11-21
Ju
n
io C Hamano
Merge bran
c
h 'jk/maint-http-half-aut
h
-fetc
h
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Six
t
h batch for 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ha
m
ano
Merge branch
'ml/cygw
i
n-min
g
w-h
e
aders'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o
C Ha
m
ano
Merge bra
n
c
h 'jk/
c
hecko
u
t-o
u
t
-of-
u
nbor
n
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ha
m
ano
Merge branch 'cn/config-missing-path'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge
b
ranch 'jl/s
u
bmodule-rm'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o
C Hama
n
o
M
erge branch 'mg/replace-resolve-delete'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
Hamano
Merge
br
a
nch 'jk/maint-gitweb-x
s
s'
commit
|
commitdiff
|
tree
2012-11-20
Junio C
H
ama
n
o
Merge
b
ranch 'rh/maint-gitweb
-
hig
h
light-ext
'
commit
|
commitdiff
|
tree
2012-11-20
J
unio C Hama
n
o
Merge bran
c
h 'pw
/
maint-p4-rcs-exp
a
nsion-newline'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Hamano
Merge bran
c
h 'mh/alt-odb
-
str
i
ng-lis
t
-cle
a
nup'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Me
r
ge branch 'ta/do
c
-c
l
ea
n
up'
commit
|
commitdiff
|
tree
2012-11-20
Junio C H
a
mano
Mer
g
e branch
'
k
b
/prel
o
ad-in
d
ex-more'
commit
|
commitdiff
|
tree
2012-11-20
Junio C H
a
mano
Merge branc
h
'jk/maint
-
ht
t
p-
h
alf-auth-fetch'
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
S
y
n
c with maint
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Further preparation for 1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hamano
Merg
e
bra
n
ch '
m
g/
m
aint-pu
l
l-suggest-upstream-t
o
' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio
C
H
amano
Merge br
a
nch
'
m
m/maint-doc-commit-edit'
i
nto maint
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
Me
r
ge b
r
anch 'as/maint-doc-fix-n
o
-post-rewrite' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
i
o
C Hamano
M
e
r
ge b
r
anch 'r
s
/lock-correct
-
r
e
f
-durin
g
-
d
e
lete'
into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
e
rge branch 'r
f
/maint-mailm
a
p-off-by-one' in
t
o maint
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hamano
Merge br
a
n
c
h 'jk/m
a
i
nt
-
di
f
f-grep-textc
o
nv' in
t
o maint
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
e
rge branch 'js/form
a
t
-2047' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-19
Junio
C
Hamano
Sync with maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Haman
o
St
a
rt pr
e
pari
n
g for
1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merge
b
ranch 'sz/maint-curl-m
u
lti-t
i
meout' into main
t
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C
Hama
n
o
M
erge bra
n
ch 'po/main
t
-refs-replace-docs'
i
nto maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C
H
amano
Me
r
ge
branch 'ph/pul
l
-
rebase-detache
d
' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
io C Hamano
Merge branch '
m
m/maint-doc-remote-tracking' into
maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merge
branch
'r
s
/bran
c
h-del-symref' in
t
o m
a
int
commit
|
commitdiff
|
tree
2012-11-19
Junio C Haman
o
Merge bran
c
h 'nd/grep-t
r
ue-pa
t
h' int
o
maint
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
i
o
C Haman
o
M
e
rge
b
r
anch 'jc/grep-pcre
-
loo
s
e-ends' (early
p
a
r
t
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Jun
i
o
C H
a
m
a
no
M
erge branch 'da/mergetools-p4' into
maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Ha
m
ano
M
er
g
e
b
ra
n
ch 'j
c
/t
e
st-sa
y
-col
o
r-avoid-echo-e
s
cape'
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
J
u
ni
o
C Ha
m
a
no
Merg
e
branch 'b
w
/con
f
ig-lift-var
i
able-name-length
-
l
imit
.
.
.
commit
|
commitdiff
|
tree
2012-11-15
Junio C Hamano
Start
1
.
8
.
1 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-15
Junio C H
a
ma
n
o
Merge branch 'jc/pre
t
tier-pretty-n
o
te'
commit
|
commitdiff
|
tree
2012-11-15
Jun
i
o C Hamano
M
e
rge branch 'mg/maint-pull-s
u
g
g
es
t
-upst
r
ea
m
-
t
o'
commit
|
commitdiff
|
tree
2012-11-15
Junio C Ham
a
no
M
e
rge bra
n
ch
'
m
h
/notes-s
t
ring-list'
commit
|
commitdiff
|
tree
next