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-tree: add comments to clarify what these functions are doing
2012-12-26
Junio C
H
ama
n
o
me
r
ge-tr
e
e: add c
o
mments to cl
a
rif
y
what these functions
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Hamano
merge-tree: lose
u
nused "resolve_directories"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-26
J
u
nio C Hama
n
o
mer
g
e
-
tree: lose
u
n
used "flags" from merge_list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-10
Jun
i
o
C
Hamano
W
hi
c
h merge_file()
funct
i
on
d
o you
m
ean?
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-04
Junio C Hamano
Merge bra
n
ch '
m
m/sta
t
us
-
push-pull-advise'
commit
|
commitdiff
|
tree
2012-12-03
Junio C
H
amano
Git 1
.
8
.
1-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-12-03
J
u
nio C Hama
n
o
Merge bran
c
h 'mm/st
a
tus-push-pull-advise'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hama
n
o
Update draft release no
t
es to 1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C Hamano
Me
r
ge branch 'pw/p4-v
a
rious
-
fixes'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hama
n
o
Merge branch '
l
t/dif
f
-stat-show-0-lin
e
s'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
amano
M
erg
e
branch '
f
c/remote-hg'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C Ha
m
a
n
o
Mer
g
e
branch 'mk/c
o
mplete-tcsh'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o
C H
a
mano
M
e
r
ge b
r
anc
h
'
j
c/doc-push-satel
l
i
t
e
'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Hamano
Me
r
ge branch 'km/send-email-re
m
ove
-
cruft-in-address'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Hama
n
o
M
e
rge b
r
a
nch
'
jk
/
send-
e
m
a
il-
s
ender-prompt
'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C Hamano
Merge bra
n
ch 'fc/send-email-no
-
sender-
p
rom
p
t'
commit
|
commitdiff
|
tree
2012-11-29
J
u
n
io C
Hamano
Merg
e
branch
'e
r
/
d
oc-ad
d
-
n
ew-comma
n
ds'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C Hamano
M
erge branch 'j
l
/submodule-rm'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ha
m
a
n
o
Me
r
ge
branch 'pp/gitweb-config
-
u
n
d
er
s
core'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C
H
aman
o
M
erge
br
a
nc
h
'fc
/
completio
n
-test
-
simpl
i
ficat
i
on'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Hama
n
o
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Ha
m
a
n
o
Merge branc
h
'master' of git://githu
b
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
amano
t4049: refocus tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-29
Junio
C Hamano
Merge branch 'm
a
s
t
er' of g
i
t:
/
/github
.
com
/
git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ham
a
no
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2012-11-28
Junio
C Hamano
Upda
t
e draft release notes to 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Haman
o
Merge branch 'fc/zsh-co
m
pletio
n
'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
M
e
rge
br
a
nc
h
'mm/status-push-pu
l
l-advise'
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o C
Ha
m
ano
Merge branch 'jk/pickaxe-textconv'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Start pre
p
aring for 1
.
8
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-28
J
u
n
io C
H
amano
M
e
rg
e
branch 'rh/maint-gitweb-
h
ighl
i
ght
-
ext' into maint
commit
|
commitdiff
|
tree
2012-11-28
Junio C
H
amano
Merge b
r
anch 'pw/mai
n
t-p4-rcs-expansio
n
-newline
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Merge branch 'fc/send-em
a
il
-
n
o-sender-prompt' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C
H
am
a
n
o
Do
c
u
m
e
nta
t
ion/git-
p
ush
.
txt:
c
la
r
i
fy the "push
f
rom
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o C Haman
o
d
i
ff --shortsta
t
:
do not
c
ount "unmerged" entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o C Haman
o
Merge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ha
m
ano
M
e
r
ge branch 'nd/maint-compat-fnmatch-fix'
i
nto maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Haman
o
Merge branch 'jh/update-re
f
-d-through-symref' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
J
u
nio C Hamano
Merge branch '
e
sr/
m
aint-d
o
c-fast-imp
o
rt' i
n
to
m
ain
t
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o C Ha
m
ano
Merge bra
n
ch 'wtk
/
submod
u
le-do
c
-fixup' into maint
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o C
H
ama
n
o
diff --s
t
at: do not
c
ount "
u
nmerged" entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Hamano
diff --stat:
mo
v
e
t
he "t
o
tal count" l
o
gic
to
the last
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
d
i
f
f --stat:
u
se "file" tempor
a
ry vari
a
b
l
e to
refer
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C
Hamano
diff --stat:
s
tatus of unmod
i
fied pair in d
i
ff-q is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-27
Junio C
Ham
a
no
tes
t
: a
d
d failing
t
es
t
s
f
or
"
dif
f
--st
a
t
"
to t4
0
49
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio
C Hamano
M
erg
e
br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ham
a
n
o
U
p
date draf
t
r
e
l
e
ase notes t
o
1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o C Hamano
M
erge branc
h
'
r
r
/
submodul
e
-diff-config'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ham
a
n
o
M
erg
e
branch 'nd/ma
i
nt-com
p
at-fnmatch-fix'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Hamano
M
e
rge
branch 'bc/
d
o-not-rec
u
rse-in
-
die'
commit
|
commitdiff
|
tree
2012-11-26
J
u
ni
o
C Hamano
Merge
b
r
anch 'mk/c
o
m
p
lete-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
Hamano
Merg
e
branch 'jh/up
d
ate-ref-d-
t
h
r
ough
-
sym
r
e
f'
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C Hama
n
o
Merge branch 'lt
/
diff-stat-show-0-line
s
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ha
m
ano
M
e
rg
e
branch 'sg/c
o
m
p
let
e
-help-un
d
up'
commit
|
commitdiff
|
tree
2012-11-26
Junio C H
a
mano
Sync w
i
th 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ham
a
no
Git 1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-26
Junio C
Ham
a
no
Merge bra
n
c
h 'jk/checkou
t
-out
-
of-un
b
orn' into maint
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch 'cn/
c
o
n
fig-miss
i
ng-path'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C
Hamano
Me
r
ge
b
ranch
'
jk/maint-gitweb-x
s
s' into maint
commit
|
commitdiff
|
tree
2012-11-21
Jun
i
o C Hamano
Update draft r
e
lease
not
e
s
f
o
r 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-impo
r
t
'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hama
n
o
Mer
g
e branch
'
wtk/s
u
bmo
d
ule-doc-fixup'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge branch 'so/prompt-command
'
commit
|
commitdiff
|
tree
2012-11-21
J
unio C Haman
o
Me
r
g
e
br
a
nch 'jk/c
o
n
f
ig-igno
r
e-duplica
t
es'
commit
|
commitdiff
|
tree
2012-11-21
Junio C H
a
m
ano
Me
r
ge branch
'
jk/m
a
i
n
t-http-
h
alf
-
auth
-
fetch'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Sixth batch
for 1
.
8
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'm
l
/cyg
w
in-m
i
ngw-
h
eaders'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hamano
Merge branc
h
'jk/checko
u
t-out-of-unborn'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'cn/config-mi
s
sing-path'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Ham
a
no
Me
r
ge bra
n
ch 'jl/subm
o
dule-rm'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Ham
a
n
o
Merge
b
ranc
h
'mg/repla
c
e
-resolve-d
e
l
ete'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge br
a
nch '
j
k/maint-gitweb-xss'
commit
|
commitdiff
|
tree
2012-11-20
Junio C H
a
mano
Merg
e
branch 'rh/main
t
-gitweb-highlight-ext'
commit
|
commitdiff
|
tree
2012-11-20
Junio C
Hamano
Merge branch 'pw
/
maint-p4-rcs
-
expansion
-
newline'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
e
rg
e
branch 'mh/alt-odb-string-l
i
st-cleanup'
commit
|
commitdiff
|
tree
2012-11-20
J
u
ni
o
C
Hamano
Merge b
r
anch
'
ta/do
c
-
c
lean
u
p'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C
Ham
a
no
Merge branch 'kb/preload-index-more'
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C Hamano
Merge branch
'jk
/
mai
n
t
-http-half-auth-fetch'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio
C
Hamano
Further pr
e
p
a
ra
t
ion for 1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Hama
n
o
Merge branch 'mg/maint-pull-sugge
s
t-upstream-t
o
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
J
u
ni
o
C H
a
man
o
M
erge branch 'mm/ma
i
nt-doc-c
o
mmit-
e
di
t
' into main
t
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge bran
c
h
'as
/
maint-doc-fix-no-post-rew
r
i
te'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
i
o C Haman
o
Me
r
ge branch 'r
s
/lock-corr
e
ct-r
e
f-durin
g
-
delete' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C
H
amano
Merge branch 'rf/m
a
int-mailmap-off-by-one' into maint
commit
|
commitdiff
|
tree
2012-11-20
J
unio C Hamano
Me
r
ge branch 'j
k
/ma
i
nt-diff-grep-textco
n
v' into maint
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hamano
M
erge br
a
nch 'js/for
m
a
t
-2
0
47' int
o
maint
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
io C
H
amano
Sy
n
c with maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Star
t
p
r
e
p
a
ring for 1
.
8
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merge branch 's
z
/maint-curl-multi-timeout'
i
nto maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Me
r
ge branch 'po/maint-re
f
s
-
replace-docs' into
maint
commit
|
commitdiff
|
tree
2012-11-19
Ju
n
io C Haman
o
Merge bra
n
c
h
'ph/pull-rebas
e
-detached' into
m
aint
commit
|
commitdiff
|
tree
2012-11-19
J
u
nio
C
Hamano
M
erge branc
h
'mm/main
t
-doc-remote-tr
a
cki
n
g' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
M
erge branch 'rs/branch-del-s
y
mref'
int
o
maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C H
a
m
ano
Merge branch 'nd
/
g
r
e
p-true-path' into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio
C Ham
a
n
o
Merge b
r
an
c
h 'jc/g
r
ep-pcre-loose-end
s
'
(early part
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Junio C Haman
o
Merge branch 'da/mergetools-p4'
into
m
ain
t
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Mer
g
e branch 'jc/test-say-colo
r
-avoid-ec
h
o-escape'
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
J
unio C Hamano
Mer
g
e
bran
c
h 'b
w
/co
n
fi
g
-lift-variable-name
-
length-
l
imit
.
.
.
commit
|
commitdiff
|
tree
2012-11-15
Junio
C Ha
m
ano
Start 1
.
8
.
1
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next