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 Hamano
Which merge_fil
e
(
) func
t
ion d
o
you mean?
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-04
Ju
n
io
C Hamano
Mer
g
e
branch 'mm/status-
p
ush-pull-advise'
commit
|
commitdiff
|
tree
2012-12-03
Junio C Hamano
Git 1
.
8
.
1-r
c
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
Ju
n
io C Hama
n
o
Merge branch 'mm/status-push
-
pull-
a
dvise'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ham
a
no
U
p
date draft rele
a
se notes to 1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Hamano
Merge branch 'pw/p4-various-fi
x
es'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Hamano
Merg
e
b
r
anch 'lt/diff-s
t
at-sho
w
-0-l
i
nes'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
M
erge branch 'fc/remote-hg'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C
Hamano
Merge br
a
nc
h
'mk/
c
omplete-t
c
s
h
'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o
C
H
a
m
a
no
M
erge branch 'jc/doc-pus
h
-sa
t
e
l
li
t
e'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C H
a
m
ano
Merge branch 'km
/
send-
e
mail-remove-cruft
-
in
-
address'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Haman
o
M
erge branch 'jk/send-email
-
send
e
r-p
r
o
m
pt'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Hamano
Merge branch 'fc/send-email-n
o
-
send
e
r-pr
o
mpt'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C H
a
mano
Merge branch 'er/doc-add-new-commands
'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C Hamano
Merge branch 'jl
/
su
b
m
o
du
l
e-rm'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C H
a
mano
Merge branch
'pp/g
i
t
w
e
b-con
f
ig-underscore'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hama
n
o
Mer
g
e branch 'fc/comp
l
e
tion-
t
est-simplific
a
tion'
commit
|
commitdiff
|
tree
2012-11-29
J
u
n
io C Hamano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Hamano
Merge branch 'm
a
ster' of git
:
//
g
ithub
.
com/gi
t
-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Junio C Haman
o
t4049:
refocus tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C Hamano
M
e
rg
e
branch 'master'
o
f
git://github
.
com/git-
l
10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ham
a
no
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2012-11-28
Junio C
Ha
m
ano
Update draft releas
e
no
t
es to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o
C H
a
mano
Merge branch 'fc/zsh
-
completion'
commit
|
commitdiff
|
tree
2012-11-28
Juni
o
C
Hamano
Merge
b
ranch
'
mm/status-push-pull-advi
s
e'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Me
r
ge branc
h
'jk/
p
i
c
kaxe-textconv'
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
Hamano
S
t
art prep
a
ring for 1
.
8
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C H
a
mano
Merge branch 'rh/maint-gitwe
b
-highlight-ext' int
o
m
aint
commit
|
commitdiff
|
tree
2012-11-28
Juni
o
C Hamano
Merge bra
n
ch 'pw/main
t
-p4-rcs-expansion-n
e
w
line' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Juni
o
C
H
ama
n
o
Merge branch
'fc/send-email-no
-
sender-prompt' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
D
oc
u
m
e
nt
a
t
i
on/git-push
.
txt: clarify the "push from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
diff --shortstat:
d
o not count
"unmerged
"
en
t
r
i
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-11-27
Juni
o
C Ham
a
no
Merge b
r
a
n
ch 'nd/maint-compat-fnm
a
tch-fix'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Hamano
Merge branch 'jh/update-re
f
-d-through-symref' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io
C
Ham
a
no
M
e
rge branch 'es
r
/maint-doc-
f
ast-i
m
p
o
r
t' into maint
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o C Hamano
Merge bra
n
ch 'wtk/submodule-
d
oc-fixup'
into maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Haman
o
d
i
ff --
s
tat
:
d
o
not
count "unmerged" entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Hamano
d
i
ff --stat: move the "total cou
n
t"
logic to
t
he
l
ast
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C H
a
mano
dif
f
-
-
s
t
at: use "file" tempo
r
a
r
y variable
t
o
ref
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Ha
m
ano
diff
--stat
:
statu
s
o
f unmodified pair i
n
diff-q is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
u
nio
C Hama
n
o
test: add failing test
s
for "d
i
ff
--stat" to t4049
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C
H
ama
n
o
Merge b
r
anch
'
main
t
'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C H
a
mano
Update dr
a
ft release
n
otes to
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
J
unio
C
Hama
n
o
M
erge
b
ranch
'
rr/submodule-di
f
f-c
o
nfig'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
H
a
m
a
n
o
Merg
e
branch 'nd/maint-compat-fnmatch-fi
x
'
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o C Hama
n
o
Merge branch 'bc/do-not-
r
ecurse-in-die'
commit
|
commitdiff
|
tree
2012-11-26
J
unio
C
Hamano
M
erge bra
n
ch 'mk/complete-tcsh
'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
Hamano
Me
r
g
e branch 'jh/update-ref
-
d-through-symref'
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o
C H
a
m
a
no
Merge branch 'lt/diff-stat-s
h
ow-0-lines'
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o
C
Hamano
M
e
rge b
r
anch 'sg/complet
e
-help-
u
ndup
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ha
m
a
n
o
S
y
n
c
with 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
Junio C H
a
mano
G
i
t
1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio
C Hamano
Merge branch 'jk/checkout-out
-
of-unborn'
i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2012-11-26
J
u
n
io C Hamano
Merge br
a
nch 'cn/c
o
nfig-mis
s
ing-pat
h
'
into maint
commit
|
commitdiff
|
tree
2012-11-26
Junio C H
a
ma
n
o
Merge b
r
anch 'jk/maint-gitweb-xss' into maint
commit
|
commitdiff
|
tree
2012-11-21
Junio C Ham
a
no
Up
d
ate
d
raft re
l
ease
n
o
tes for 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Junio C
Hamano
Merge branch 'esr/maint-doc-fast
-
import'
commit
|
commitdiff
|
tree
2012-11-21
Juni
o
C Hamano
Merge branch 'wtk
/
sub
m
odule-doc-f
i
xup'
commit
|
commitdiff
|
tree
2012-11-21
J
unio C Hamano
Merge br
a
nch
'
so/pro
m
p
t
-command'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Ha
m
a
n
o
Merge bran
c
h 'jk/config-ignore-dupl
i
cates
'
commit
|
commitdiff
|
tree
2012-11-21
Junio C
H
amano
M
e
rge br
a
nch
'jk/maint-h
t
tp
-
half-auth-fetc
h
'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Ham
a
no
Sixth
b
at
c
h fo
r
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Junio C
Hama
n
o
Merge branch 'ml/cygwin-mingw-
h
eade
r
s'
commit
|
commitdiff
|
tree
2012-11-20
J
unio C H
a
mano
Merge bran
c
h 'jk/checkout-out
-
of-unbor
n
'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C Hamano
Merge b
r
anch 'cn/config-miss
i
ng-path'
commit
|
commitdiff
|
tree
2012-11-20
Junio C
Ha
m
ano
Merge branch '
j
l/submodule
-
rm'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o
C
H
aman
o
Mer
g
e branch 'mg/replace-resolv
e
-delete
'
commit
|
commitdiff
|
tree
2012-11-20
J
un
i
o C
Hamano
Me
r
ge branch
'
jk/m
a
int-g
i
t
web-
x
ss'
commit
|
commitdiff
|
tree
2012-11-20
Junio C
H
a
mano
M
e
r
ge branch 'rh/ma
i
nt-gi
t
web-highlight-ext'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Ha
m
ano
Mer
g
e bra
n
c
h
'pw/maint-p4-rcs-exp
a
ns
i
on-
n
ewline'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge br
a
nch 'mh/alt-odb
-
string-list
-
cleanup'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Me
r
ge branc
h
'
ta/doc-cleanup'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hama
n
o
Me
r
ge
b
ranch 'kb/p
r
eload
-
inde
x
-
more'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ha
m
ano
Merge bra
n
ch 'jk
/
mai
n
t-http-half-
a
uth-fetc
h
'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Sync with m
a
i
nt
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ham
a
n
o
Further preparation for 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Junio C Haman
o
Merge branch 'm
g
/ma
i
nt-p
u
l
l-su
g
gest-u
p
stre
a
m-to' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
Haman
o
Merge
b
r
a
nc
h
'm
m
/maint-doc-co
m
m
i
t
-
edit' into maint
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
Merge b
r
anch 'as/
m
a
i
nt-doc-
f
ix-
n
o-post-rewrite' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hama
n
o
Merge branc
h
'rs/lock
-
correct-ref-during-delete'
into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C Hamano
Merge bran
c
h 'rf/ma
i
n
t-mail
m
ap-off-by-on
e
' int
o
maint
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
Hamano
Merge
b
ranch 'jk
/
maint-diff-grep-tex
t
conv' i
n
to maint
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Ha
m
ano
Merge branch
'
js/format-2047' into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Sync with m
a
int
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Start p
r
eparing
for 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-19
J
u
n
i
o C Ham
a
no
Merge branc
h
'sz/maint-
c
url-multi-timeout' in
t
o maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Me
r
ge branch 'po/maint-re
f
s
-rep
l
ace-docs' i
n
to maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Ham
a
n
o
Merge branc
h
'ph/pu
l
l-rebas
e
-deta
c
hed' into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Ham
a
no
Merge
branch
'
mm/maint-doc-remote-
t
r
acking' into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio
C
Hamano
Merg
e
branch 'rs/
b
ranc
h
-del-s
y
mref' into maint
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
io C Hamano
M
erge branch 'nd/
g
rep-t
r
ue
-
path'
into maint
commit
|
commitdiff
|
tree
2012-11-19
J
unio
C Hamano
Merge
branc
h
'
jc/grep-pcre-loos
e
-end
s
'
(early part
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C
Hamano
Merge branc
h
'da
/
merg
e
t
oo
l
s-p4' into maint
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
io C Hamano
Merg
e
branch 'jc/test-say-color-avoid
-
echo-escape'
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
J
u
nio C Hamano
Merge bran
c
h 'bw/config
-
li
f
t-variable-name-length-limit
.
.
.
commit
|
commitdiff
|
tree
2012-11-15
Junio C Ha
m
ano
Start 1
.
8
.
1 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-15
Junio C H
a
mano
M
erg
e
branch 'jc/pret
t
i
er-pr
e
tt
y
-note'
commit
|
commitdiff
|
tree
2012-11-15
Juni
o
C Hamano
M
e
rge
branch 'm
g
/m
a
int-pull-
s
uggest-upstream
-
t
o'
commit
|
commitdiff
|
tree
2012-11-15
J
unio C Hamano
Merg
e
b
r
anch 'mh/no
t
es-string
-
list'
commit
|
commitdiff
|
tree
next