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 Ha
m
ano
merg
e
-tree:
add comments
t
o clarify what these functio
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Ju
n
io C Hamano
merge-tree: lose u
n
u
s
ed "res
o
lve_directories
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
J
u
nio
C
Hamano
merge-tree:
l
ose unused "f
l
ag
s
"
from merge_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-10
Jun
i
o C Ham
a
no
Which me
r
ge_file() function do you mean?
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-04
Junio
C Hama
n
o
Me
r
ge branch 'mm/status-push-pull-advise'
commit
|
commitdiff
|
tree
2012-12-03
J
u
nio C Hamano
Git 1
.
8
.
1-
r
c
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
J
u
nio C H
a
mano
Merge br
a
nch 'mm
/
status-push-pu
l
l-advise'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ha
m
ano
Update
d
r
aft rele
a
se notes to 1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'pw/p4
-
var
i
ous
-
fixes'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Hamano
Merge bra
n
ch 'lt/
d
i
f
f-stat-sh
o
w
-0-lines
'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C Ham
a
no
Merge branch 'fc/remote-hg'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Ham
a
no
M
e
rge br
a
nc
h
'm
k
/complete-tcsh'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C
Ham
a
no
Merge branch
'jc/doc-
p
u
s
h
-satelli
t
e'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Haman
o
Mer
g
e bran
c
h 'km/s
e
nd-em
a
il-
r
emove-cruft-in-addr
e
ss'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Hamano
Merge
branch 'jk/send-email-sende
r
-
p
rompt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
M
erg
e
branch 'fc/send-
e
mail-no-send
e
r-prompt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Haman
o
Me
r
g
e
bra
n
ch 'e
r
/do
c
-ad
d
-new-commands'
commit
|
commitdiff
|
tree
2012-11-29
Juni
o
C Hamano
Merge branch 'jl/subm
o
dule-rm'
commit
|
commitdiff
|
tree
2012-11-29
J
u
n
io C Haman
o
Merg
e
b
r
anch 'pp/gitweb-config-underscore'
commit
|
commitdiff
|
tree
2012-11-29
J
unio
C Hamano
Merge
b
r
anch 'fc/c
o
mp
l
etion-test-simplif
i
cation'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Hamano
Merge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Ham
a
no
Merge b
r
anch 'master' of git://g
i
thub
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o
C Hamano
t4049: refocus
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Junio C H
a
mano
Mer
g
e branch
'
m
aster' of git://github
.
com/git-l
1
0n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o
C Ham
a
no
Merg
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ha
m
ano
Update draft release note
s
to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Mer
g
e
b
ranch 'f
c
/zsh-c
o
mpletion'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Haman
o
Merge br
a
nch
'mm/status-push
-
pull-
a
d
v
ise'
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
io
C
Hamano
Merge branch 'jk/pi
c
k
a
xe-textconv'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
St
a
rt prepari
n
g for
1
.
8
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Jun
i
o C Haman
o
Merge
b
ranch 'rh/main
t
-
g
itweb-highlig
h
t
-
ext' i
n
to maint
commit
|
commitdiff
|
tree
2012-11-28
Juni
o
C Hamano
Mer
g
e
branch
'
pw/mai
n
t
-
p
4
-
rcs
-
ex
p
an
s
ion-newline' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Juni
o
C
Hamano
Merge branc
h
'
fc/send-ema
i
l-no-s
e
nder-prompt' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Documen
t
at
i
on/git-push
.
txt: clarify the "push
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
unio
C
Ha
m
ano
diff --shortstat: do not co
u
nt
"
un
m
erged" entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C
Hama
n
o
Merge branch
'
m
ain
t
'
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hama
n
o
M
e
r
ge branch 'nd/maint-compa
t
-f
n
match-fix' i
n
to
m
aint
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o
C
Ham
a
no
Merge bran
c
h '
j
h
/updat
e
-ref-d-through-symref' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Junio C
H
ama
n
o
Merge b
r
anch '
e
sr/mai
n
t-doc
-
fast-import' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hama
n
o
Merge
branch
'
wtk/submod
u
le-doc-fixup'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-27
Juni
o
C
H
amano
diff -
-
sta
t
:
do not
count "unmerged" entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
J
unio C Hamano
diff --stat: mov
e
the "total count"
log
i
c to t
h
e
l
ast
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Hamano
diff --stat: use "file" temporary variable to refe
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
d
i
ff --stat: status of unmodifie
d
p
ai
r
in diff-q is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
test: add faili
n
g
tests for "di
f
f --stat" to t40
4
9
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Update d
r
aft
r
e
lease notes t
o
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge b
r
an
c
h 'rr/su
b
module-diff-config'
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o C Hamano
Mer
g
e branch 'nd/maint
-
compat-fnmatch
-
fix
'
commit
|
commitdiff
|
tree
2012-11-26
J
u
ni
o
C Hamano
M
erge b
r
anch 'bc/do-not-recurse-in-d
i
e
'
commit
|
commitdiff
|
tree
2012-11-26
J
unio
C Hamano
Merge branch 'mk/co
m
plete-tcs
h
'
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o C Hamano
Merg
e
bra
n
c
h
'jh/update-ref-
d
-
t
hro
u
gh-sym
r
ef'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
H
am
a
no
Merge branch
'
l
t
/d
i
ff-stat-
s
how-
0
-
l
i
n
es'
commit
|
commitdiff
|
tree
2012-11-26
Juni
o
C H
a
mano
M
erg
e
br
a
nch 'sg/c
o
mplete-help-
u
ndup'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
Hama
n
o
Sync with 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ha
m
ano
Git 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
Junio C H
a
mano
Merge b
r
a
nch '
j
k/checkout-
o
ut-
o
f-unborn
'
int
o
main
t
commit
|
commitdiff
|
tree
2012-11-26
Junio
C Haman
o
Merg
e
branch 'cn/config-m
i
ssing-path' into main
t
commit
|
commitdiff
|
tree
2012-11-26
Jun
i
o
C Hamano
Me
r
ge branc
h
'jk/
m
aint-gitw
e
b-xss
'
into maint
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Update dra
f
t re
l
ease notes f
o
r 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-21
Juni
o
C Haman
o
Merge branch
'esr/maint-doc-fas
t
-im
p
ort'
commit
|
commitdiff
|
tree
2012-11-21
Junio C H
a
mano
Merge branch 'wtk/s
u
bmodule-d
o
c-fixup'
commit
|
commitdiff
|
tree
2012-11-21
Junio
C Hamano
Mer
g
e bra
n
c
h 'so/prompt-comman
d
'
commit
|
commitdiff
|
tree
2012-11-21
Ju
n
io C Hamano
M
e
rge branch 'jk/c
o
nf
i
g-ig
n
ore-duplicates'
commit
|
commitdiff
|
tree
2012-11-21
Junio C Hamano
Merge br
a
nch 'jk/maint-
h
ttp-half-auth-fetch'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Hama
n
o
Six
t
h b
a
tch f
o
r 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Me
r
ge branch 'ml/cygwin
-
mingw-headers'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Me
r
ge branch 'jk
/
checkout-out
-
o
f
-unbor
n
'
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o
C Hamano
Merge
branch 'cn/config-
m
issing
-
path'
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C Hamano
Merge bra
n
ch 'jl/s
u
bmod
u
le
-
rm'
commit
|
commitdiff
|
tree
2012-11-20
J
u
ni
o
C Ham
a
n
o
M
erge br
a
nc
h
'mg/r
e
place-res
o
l
ve-delete
'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
i
o C Ha
m
an
o
Merge branch 'jk
/
maint-
g
itweb-xss
'
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C
H
amano
Merge bra
n
ch 'rh/maint-gitweb
-
highlight-ext'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ham
a
no
Merge branch 'pw/maint-p4
-
rcs-expa
n
sion-newline'
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C
Hama
n
o
Merge branch 'mh/alt-odb-string-
l
ist-cleanup'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'ta/
d
oc-cl
e
anup'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Haman
o
M
erge bra
n
ch 'kb/pr
e
load-
i
ndex-mo
r
e'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Haman
o
Mer
g
e branch 'jk/maint
-
h
tt
p
-h
a
lf
-
auth-fetch'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Ham
a
n
o
Sync with m
a
int
commit
|
commitdiff
|
tree
2012-11-20
J
u
ni
o
C Ham
a
no
Furthe
r
p
r
e
p
a
ration
f
o
r
1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
J
unio C Ham
a
no
Mer
g
e
b
ranch 'mg
/
ma
i
nt-pull
-
sugge
s
t-upstrea
m
-to' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Merge branch 'mm/mai
n
t-doc-commit-edit
'
into maint
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Ham
a
no
Merge
b
ranch 'as/maint-doc-fix-no-
p
ost-rewrite
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio C
H
amano
M
e
r
g
e
branch 'rs/lock-correct-ref-during-
d
elet
e
' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C Hamano
Merge branch 'rf/maint-mailmap-off
-
by-one' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Haman
o
Merge bran
c
h
'jk/maint-dif
f
-g
r
ep-textconv' int
o
m
a
int
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ham
a
no
M
e
rge branch 'js/format-20
4
7' into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
S
y
nc w
i
th maint
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C
H
aman
o
Start prepa
r
ing
f
or
1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
M
e
rge branch 'sz/maint-curl-
m
u
l
ti-t
i
me
o
u
t' into main
t
commit
|
commitdiff
|
tree
2012-11-19
Junio C
H
amano
Me
r
ge branch 'po/maint-refs-r
e
p
l
ace-docs' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C Hamano
Merg
e
b
ranch 'ph/pull-rebas
e
-d
e
tached' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-11-19
Jun
i
o C Hamano
Merge bra
n
ch '
m
m/maint-d
o
c-re
m
ote-track
i
n
g
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-11-19
J
unio C Hamano
M
e
rge branch 'rs/bra
n
ch-del-symref' i
n
to maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C
Hamano
M
erge
b
ranch 'nd/grep-tr
u
e
-path
'
into
m
aint
commit
|
commitdiff
|
tree
2012-11-19
J
unio C Hamano
Merge b
r
a
n
ch 'jc/grep-p
c
r
e
-loose
-
ends'
(
early pa
r
t
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
J
u
nio C H
a
mano
Me
r
ge branch
'
da/merge
t
ools-p4' into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merge branch '
j
c
/
test-say-color-av
o
id
-
echo-escape'
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Junio C Ha
m
ano
Merge branch 'bw/confi
g
-lift-variable-name-lengt
h
-l
i
mit
.
.
.
commit
|
commitdiff
|
tree
2012-11-15
J
u
nio C Hamano
S
tar
t
1
.
8
.
1
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next