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: fix d/f conflicts
2012-12-26
Junio C Hamano
merge-t
r
ee: fix d/f conf
l
i
cts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
J
u
nio C Hamano
me
r
ge-tree: add
com
m
ents to clari
f
y what these func
t
i
ons
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C H
a
mano
merge-tree: lose un
u
se
d
"resolve_directories
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-26
Junio C Hamano
merge-tree: lose unused "flag
s
" fr
o
m
m
e
r
ge_l
i
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-10
J
u
nio C H
a
mano
Which merge_
f
ile()
function do you mea
n
?
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-04
J
u
nio C Ha
m
ano
Me
r
g
e
branch 'mm/statu
s
-push-pull-advise'
commit
|
commitdiff
|
tree
2012-12-03
Jun
i
o C H
a
mano
Git 1
.
8
.
1-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-12-03
Ju
n
io C
H
amano
M
erge branch 'mm/sta
t
us-pu
s
h-pull-advise'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Haman
o
U
p
dat
e
dr
a
ft release notes to 1
.
8
.
1
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
Hamano
Merge b
r
anch
'
p
w
/p4-v
a
rious-fixes
'
commit
|
commitdiff
|
tree
2012-11-29
Ju
n
io C Hamano
Me
r
ge bran
c
h 'lt/diff-s
t
a
t
-show-0-lines'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C
Hamano
M
e
rge branch '
f
c/remote-hg'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge b
r
anch 'mk
/
complete-t
c
sh'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'jc
/
d
o
c-pu
s
h-s
a
tellite
'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Ha
m
ano
Merge branch 'km/send-email-remove-cruft-in-add
r
ess'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C Haman
o
Merge branch 'jk/se
n
d-email-sen
d
er
-
p
r
o
m
pt'
commit
|
commitdiff
|
tree
2012-11-29
Junio C Hamano
Merge branch 'f
c
/send-em
a
il
-
n
o-
s
ender-pr
o
mpt
'
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C H
a
mano
Merge bra
n
ch
'
e
r
/doc-add-new-comm
a
nds'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
Hamano
Merge
bran
c
h 'jl/sub
m
odule-rm'
commit
|
commitdiff
|
tree
2012-11-29
Junio C
H
amano
Merge branch 'pp/
g
i
t
web-config-undersco
r
e'
commit
|
commitdiff
|
tree
2012-11-29
Junio
C
H
amano
Merg
e
branch 'fc/comp
l
eti
o
n-test
-
s
i
mpl
i
fication'
commit
|
commitdiff
|
tree
2012-11-29
J
u
nio C Hamano
Mer
g
e b
r
a
n
ch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2012-11-29
J
unio C
H
ama
n
o
Merge b
r
anch
'master' of git://git
h
u
b
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o C Hama
n
o
t4049: refocus tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-29
Jun
i
o
C
H
aman
o
Merge
branc
h
'ma
s
te
r
' o
f
git://github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ham
a
no
Merge
b
r
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2012-11-28
Junio C
H
amano
U
p
date draft release notes to
1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
Hamano
Merge branch 'fc/z
s
h-co
m
pletion
'
commit
|
commitdiff
|
tree
2012-11-28
Juni
o
C Hamano
M
e
rge branch 'mm/status-push-pull-a
d
vis
e
'
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Merge b
r
a
n
ch 'jk/pi
c
kaxe-textconv'
commit
|
commitdiff
|
tree
2012-11-28
Junio
C
Hama
n
o
Start
p
reparing for
1
.
8
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
M
e
rge
bra
n
ch 'rh/maint-
g
itweb-h
i
ghlight-ext' into maint
commit
|
commitdiff
|
tree
2012-11-28
Junio C Ham
a
no
Merg
e
br
a
nch 'pw/maint-p4-rcs-expansion-newlin
e
' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Ju
n
i
o C Hamano
Merge
b
ranch 'fc/
s
e
n
d
-e
m
ail-no-
s
ender-pro
m
pt' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-28
Junio C Hamano
Document
a
tion/git-push
.
t
x
t:
c
l
a
ri
f
y t
h
e
"pu
s
h from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
dif
f
--shortstat:
d
o not c
o
unt "un
m
erg
e
d" en
t
ries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C H
a
man
o
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2012-11-27
Junio C Ham
a
no
Merge bran
c
h 'nd/
m
aint-comp
a
t-
f
n
match-fix
'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Mer
g
e branch
'jh/
u
pdate-ref-d-t
h
rough-s
y
mref' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Merge branch 'esr/maint
-
doc-fast-
i
m
p
ort'
i
nto maint
commit
|
commitdiff
|
tree
2012-11-27
Junio C Hamano
Me
r
g
e branch
'wt
k
/submodu
l
e
-
do
c
-fixup' into maint
commit
|
commitdiff
|
tree
2012-11-27
Jun
i
o C Hamano
diff -
-
stat: do
n
o
t
count "unmerged" ent
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Ham
a
no
diff
-
-
stat: move the "total count" logic to the
last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio C
Hamano
d
iff -
-
stat:
use
"
f
i
le" temporary variable to refe
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Ju
n
io C Hamano
diff --stat: status of
unmodified pai
r
in diff-q is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-27
Junio
C Hamano
test:
a
d
d
fa
i
li
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 Haman
o
Merge
bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2012-11-26
Junio
C
H
amano
Update draft rel
e
ase
n
ote
s
to 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
J
unio C Hamano
Merge bran
c
h
'rr/subm
o
d
u
l
e-dif
f
-confi
g
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge branch 'nd/maint-compat-fn
m
a
tch-fix'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Haman
o
Merge
branch
'bc/do-not-recurse-in-di
e
'
commit
|
commitdiff
|
tree
2012-11-26
Ju
n
io C Hamano
Mer
g
e
b
ranch
'mk/complete-tcsh'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hama
n
o
Merge branch
'
jh/update-ref-d
-
through-symref'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Ham
a
no
Merge b
r
anch '
l
t/diff
-
stat-show-0-li
n
e
s
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C Hamano
Merge bran
c
h 'sg/complete-help-
u
ndup
'
commit
|
commitdiff
|
tree
2012-11-26
Junio C
H
a
m
a
n
o
Syn
c
with 1
.
8
.
0
.
1
commit
|
commitdiff
|
tree
2012-11-26
J
u
nio C Hamano
Git 1
.
8
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-26
J
unio C
Hamano
M
e
rge branch 'jk/checkout-out-o
f
-unborn' into
maint
commit
|
commitdiff
|
tree
2012-11-26
Junio
C Hamano
Merge
branch '
c
n/
c
onfig-miss
i
ng-pat
h
' into main
t
commit
|
commitdiff
|
tree
2012-11-26
Ju
n
io
C
Hamano
Merge br
a
nch '
j
k/maint-git
w
e
b-xss
'
into maint
commit
|
commitdiff
|
tree
2012-11-21
Jun
i
o C Hama
n
o
Update draft releas
e
notes 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-d
o
c-fast-import'
commit
|
commitdiff
|
tree
2012-11-21
Junio C H
a
mano
Mer
g
e branch 'w
t
k
/submodule-doc-fi
x
up'
commit
|
commitdiff
|
tree
2012-11-21
Junio C
H
amano
Me
r
ge branc
h
'so/p
r
ompt-command'
commit
|
commitdiff
|
tree
2012-11-21
Junio
C
H
a
mano
Merg
e
branch
'jk/config-ignore-d
u
plicates
'
commit
|
commitdiff
|
tree
2012-11-21
Ju
n
io C
H
aman
o
Merge branch '
j
k
/maint-htt
p
-half-auth-fetch'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
S
i
xt
h
batch f
o
r 1
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
H
amano
Merge branch 'ml
/
cygwin-ming
w
-heade
r
s'
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hamano
Merge branch
'jk/
c
heck
o
u
t-out-of-unborn'
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C Hamano
Merge branch
'cn
/
config-missing-path'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Mer
g
e br
a
nch 'jl/submo
d
ule-
r
m'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Haman
o
Me
r
ge b
r
a
nch
'
m
g
/replace-
r
esolve-del
e
te'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Me
r
ge bran
c
h
'j
k
/maint-g
i
tweb-x
s
s'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
M
e
r
ge br
a
nch
'
rh/maint-gitw
e
b-highlight-e
x
t
'
commit
|
commitdiff
|
tree
2012-11-20
J
unio C Hama
n
o
M
erge
b
ranc
h
'pw/maint-p4-rcs-expansio
n
-
n
e
wline
'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
H
a
mano
Mer
g
e branch 'm
h
/alt-o
d
b-string-list-clea
n
up'
commit
|
commitdiff
|
tree
2012-11-20
Junio
C
Haman
o
Merge branch 'ta/doc-cleanup'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Haman
o
Mer
g
e
b
ranch 'kb/p
r
eload-
i
ndex-more'
commit
|
commitdiff
|
tree
2012-11-20
Juni
o
C Hamano
M
erge br
a
nch
'
jk/maint-http-half-auth-fetch'
commit
|
commitdiff
|
tree
2012-11-20
Junio C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2012-11-20
Jun
i
o C Hama
n
o
Furt
h
er 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 Ha
m
a
n
o
M
erge branch
'
mg/m
a
int-pull
-
suggest-upstr
e
am-to' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
J
u
nio C
H
amano
M
e
rge branch
'
mm/maint-doc
-
commit-edit' into maint
commit
|
commitdiff
|
tree
2012-11-20
Ju
n
io C Hamano
Merge
br
a
nch 'as/maint-doc-fi
x
-no-post-rewrit
e
' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio
C Ha
m
a
n
o
Merg
e
branch '
r
s/lo
c
k
-corr
e
ct-ref-during-dele
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2012-11-20
Junio C
H
amano
M
erge br
a
nch 'rf/maint-mai
l
ma
p
-o
f
f-b
y
-one' in
t
o maint
commit
|
commitdiff
|
tree
2012-11-20
Junio C Ham
a
no
Merge br
a
nch 'jk/m
a
int
-
diff-grep-textconv' into mai
n
t
commit
|
commitdiff
|
tree
2012-11-20
J
u
n
io C H
a
mano
Me
r
g
e branch 'j
s
/format-2047' into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Ham
a
no
S
y
nc w
i
th
maint
commit
|
commitdiff
|
tree
2012-11-19
Junio
C
Hamano
Start pre
p
arin
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 branch
'
sz/maint-c
u
r
l
-multi-t
i
meout' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-19
J
unio C
H
a
mano
Merge branch 'po/maint-refs-replace-do
c
s
'
into maint
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
M
erge branch 'ph/pull
-
rebase-detached' into ma
i
nt
commit
|
commitdiff
|
tree
2012-11-19
J
unio C Hamano
Merge branch
'm
m
/
maint-doc-remote-tr
a
cking'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-11-19
Junio C Hamano
Merge bra
n
ch
'rs/bran
c
h-de
l
-
symref' into
m
a
int
commit
|
commitdiff
|
tree
2012-11-19
J
un
i
o C
Hamano
M
e
rge branch 'nd/gre
p
-true-path' into maint
commit
|
commitdiff
|
tree
2012-11-19
Jun
i
o C Hama
n
o
Merge
b
ranch 'j
c
/
g
r
ep-p
c
r
e-lo
o
se-end
s
' (early part
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Juni
o
C Hamano
M
erge branch 'da/mergetoo
l
s-p4' into main
t
commit
|
commitdiff
|
tree
2012-11-19
Junio
C
Hama
n
o
Merge
b
ranch
'jc/tes
t
-sa
y
-color-avoid-echo
-
e
s
cape'
.
.
.
commit
|
commitdiff
|
tree
2012-11-19
Jun
i
o C Hamano
Me
r
ge bran
c
h
'
bw/config-
l
if
t
-v
a
ri
a
ble-name-length-limit
.
.
.
commit
|
commitdiff
|
tree
next