repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/pager-per-command' into next
2010-11-25
Juni
o
C Haman
o
Mer
g
e branch 'jk/pager-per-c
o
mmand' into next
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hamano
Merge branch 'j
k
/maint-decorate-0
1
-bo
o
l'
i
nto next
commit
|
commitdiff
|
tree
2010-11-25
Junio C
Ham
a
no
Merge br
a
nch
'gc/h
t
tp-wi
t
h-non-as
c
ii-username-ur
l
'
.
.
.
commit
|
commitdiff
|
tree
2010-11-25
J
u
nio C Hamano
Merge
b
ranc
h
'gb/git
w
eb-remote-
h
e
a
d
s
' i
n
t
o
next
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hamano
Merge branch 'jh/notes-m
e
rge' into nex
t
commit
|
commitdiff
|
tree
2010-11-25
Junio C
H
amano
M
e
rge
branch 'pn/commit
-
autosquash'
into next
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hamano
Merge bran
c
h 'j
j
/icase-director
y
'
i
n
to next
commit
|
commitdiff
|
tree
2010-11-25
Junio C Hamano
Merge branch 'il/r
e
mote
-
fd-ext' into ne
x
t
commit
|
commitdiff
|
tree
2010-11-25
Ju
n
i
o
C Hamano
Merge
branch
'm
a
ster' into n
e
xt
commit
|
commitdiff
|
tree
2010-11-24
Junio C
H
amano
Merg
e
branch 'cb/maint-orphan-me
r
g
e
-
noclob
b
er
'
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hama
n
o
Merge
b
ran
c
h
'ao/sen
d
-email-irt'
commit
|
commitdiff
|
tree
2010-11-24
J
u
n
i
o C H
a
m
ano
Merg
e
b
r
anch 'jk/add-e-d
o
c'
commit
|
commitdiff
|
tree
2010-11-24
J
u
n
io C
Ha
m
ano
Merge branc
h
'r
s
/opt-help-text
'
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge bran
c
h
'kb/maint-re
b
ase-
a
u
t
osquash'
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
M
erge b
r
a
n
c
h 'mm/
p
hrase-remote-t
r
ac
k
i
n
g
'
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge
b
ranch
'
en/
a
nd-c
a
scade-tests'
commit
|
commitdiff
|
tree
2010-11-24
J
u
ni
o
C Hamano
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge branch '
j
l/maint-
p
ull-tags-doc'
into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Ha
m
a
n
o
M
e
r
ge b
r
anch
'kb/
m
ai
n
t-diff-ws-check' into main
t
commit
|
commitdiff
|
tree
2010-11-24
J
unio C Hamano
Me
r
g
e
b
ra
n
ch 'jm/mailmap'
into mai
n
t
commit
|
commitdiff
|
tree
2010-11-24
J
u
nio C Hamano
M
e
rg
e
bran
c
h 't
r
/
maint-git
-
repack-tmpfile' into maint
commit
|
commitdiff
|
tree
2010-11-24
Ju
n
io
C
Hamano
Merge branch 'jk/maint-apply
-
n
o
-binary' into maint
commit
|
commitdiff
|
tree
2010-11-24
J
unio
C Ha
m
ano
Merge
b
ranch
'jn/send-p
a
c
k
-
error' into maint
commit
|
commitdiff
|
tree
2010-11-24
Juni
o
C
Ha
m
ano
M
e
rge branch 'a
k
/submodule-sy
n
c'
i
nto maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C H
a
mano
M
e
rge branch 'jk
/
maint
-
rev-l
i
st-nul' into m
a
int
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
M
erge branc
h
'
c
b/diff-fname-optim' in
t
o maint
commit
|
commitdiff
|
tree
2010-11-24
Jun
i
o C Hamano
Merge branch 'jk/no-textconv-s
y
m
link' into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
M
e
rg
e
branch
'
dk/maint-blame-el' into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
M
e
rge
b
r
anch 'aw/git-p4-deletio
n
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2010-11-24
Jun
i
o
C
Hamano
Mer
g
e
branch 'kf/post
-
r
e
ceive-s
a
mp
l
e
-
hoo
k
' into main
t
commit
|
commitdiff
|
tree
2010-11-24
J
unio C H
a
mano
Merge branch
'
j
k
/repa
c
k-reuse-obj
e
ct'
in
t
o
maint
commit
|
commitdiff
|
tree
2010-11-24
Junio C Hamano
Merge
b
ranch 'bc/fix-che
r
ry-
p
ick-roo
t
' into mai
n
t
commit
|
commitdiff
|
tree
2010-11-24
Juni
o
C
Hamano
Merge bra
n
c
h 'uk/fix-author
-
ident-s
e
d-sc
r
ipt
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-11-24
J
u
n
io C Hamano
Merge branch 'ab/makefile-track-cc' into maint
commit
|
commitdiff
|
tree
2010-11-24
Junio
C
Haman
o
Merge b
r
anch
'
mg/r
e
s
et-do
c
'
into m
a
int
commit
|
commitdiff
|
tree
2010-11-24
Junio C
Haman
o
Merge branch
'
tr/send-email-refuse-sendi
n
g
-une
d
i
t
ed
.
.
.
commit
|
commitdiff
|
tree
2010-11-24
Diego Elio
Pette
n
ò
im
a
p-send: link against libcryp
t
o for HM
A
C and others
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-24
Joe Perc
h
es
git-sen
d
-e
m
ail
.
perl:
Dedu
p
licate
"
to:" and
"cc:" en
t
ries
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-24
Eri
k
Faye-L
u
nd
mingw: do not
s
et e
r
rno to
0
o
n
s
u
ccess
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-24
Junio C
H
amano
Me
r
ge branch '
e
f/mingw-daemon'
commit
|
commitdiff
|
tree
2010-11-19
I
lari Liusvaar
a
r
emote-fd/e
x
t
:
finishing t
o
uc
h
e
s
after c
o
de r
e
view
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-18
Ju
n
io C Hamano
Up
d
ate draft release note
s
to 1
.
7
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Junio C Ham
a
no
Merge b
r
an
c
h 'cb/leading
-
path-removal' in
t
o next
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
i
o
C
H
amano
Merg
e
b
ranch 'master'
into n
e
xt
commit
|
commitdiff
|
tree
2010-11-17
Junio
C
Hamano
M
erge branc
h
'jl/maint-pul
l
-tag
s
-doc'
commit
|
commitdiff
|
tree
2010-11-17
J
unio C Ham
a
no
M
e
rge b
r
anch 'kb/maint-
s
ubmo
d
ul
e
-
s
avearg'
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C Haman
o
Merge branch 'jk/missin
g
-
c
o
n
fig'
commit
|
commitdiff
|
tree
2010-11-17
Junio C H
a
mano
Merge
bran
c
h 'kb/maint-diff-ws-ch
e
ck
'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Haman
o
Mer
g
e branch '
b
g
/
m
aint-gitweb
-
test-li
b
'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge
branc
h
'
j
m/ma
i
lmap'
commit
|
commitdiff
|
tree
2010-11-17
J
unio C Ham
a
no
M
e
rge branch 'tr/
m
a
i
nt-git
-
repack-tmpfile'
commit
|
commitdiff
|
tree
2010-11-17
J
unio C Ha
m
ano
Merge branc
h
'jk/mai
n
t-apply-no-binary'
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C
Hamano
Me
r
ge bra
n
c
h
'jk/push-pro
g
ress'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge
b
ranch
'tr/mai
n
t
-
merge-file-subdi
r
'
commit
|
commitdiff
|
tree
2010-11-17
Jun
i
o C Hamano
Me
r
g
e
br
a
nch 'j
n
/send-pack-er
r
or'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Me
r
ge b
r
a
nch 'mg/make-prove'
commit
|
commitdiff
|
tree
2010-11-17
Junio C
H
aman
o
Merge branch 'kb/completion-checkout
'
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
i
o
C Ham
a
no
Merge branch 'sg
/
completion'
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
i
o C Hamano
Merge branc
h
'sg/bisect'
commit
|
commitdiff
|
tree
2010-11-17
Junio C
H
amano
Merge
branch 'ak/submo
d
ul
e
-
s
ync'
commit
|
commitdiff
|
tree
2010-11-17
Jun
i
o
C H
a
ma
n
o
Merge bra
n
c
h 'jk/maint-rev-list-nul'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge bra
n
ch 'ks/no
-
t
ext
c
onv-symlink'
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C Ha
m
ano
Merge br
a
n
c
h 'j
n
/gitweb-
t
est'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Ham
a
no
Merge branch 'cb
/
diff-fnam
e
-opt
i
m'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge
branch 'jk
/
n
o
-t
e
x
t
conv-symlink'
commit
|
commitdiff
|
tree
2010-11-17
J
u
n
i
o C Hamano
Merg
e
bra
n
ch 'dk
/
maint-blame-el'
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C Haman
o
M
er
g
e branch 'ef/mingw-daemon'
into nex
t
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge
b
ranch '
j
c/emfile' into next
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C Hamano
Merge branch 'md/in
t
erix
'
into next
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C Ham
a
no
Mer
g
e branch 'jl/add
-
p-reverse-
m
essage' into ne
x
t
commit
|
commitdiff
|
tree
2010-11-17
Junio C
Hamano
M
erge branch 'jl/clone-recurse-sm-syn
o
nym'
i
n
to
nex
t
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'jn/che
r
ry-
p
ic
k
-refre
s
h-index' int
o
ne
x
t
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Mer
g
e
bra
n
c
h 'rr/n
e
eds-clean-wor
k
-
tree' into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C Haman
o
Me
r
ge branch 'cm/diff-chec
k
-at-eo
l
' into next
commit
|
commitdiff
|
tree
2010-11-17
J
unio C Ha
m
ano
Mer
g
e branch
'fc/apply-p2-get
-
header
-
n
ame'
into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C
H
amano
Merg
e
b
r
anch
'jn/fast-import-fix' into next
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C Hama
n
o
Merge bra
n
ch 'kb/b
l
ame-
a
uthor-email' int
o
next
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C Hamano
Merge branch 'np/diff-in-corrupt-repository'
into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch
'
np/pack-broken-boundary' in
t
o ne
x
t
commit
|
commitdiff
|
tree
2010-11-17
J
unio
C
Ham
a
no
Me
r
ge branch 'ak
/
apply-
n
on-
g
it-epo
c
h'
i
nto n
e
xt
commit
|
commitdiff
|
tree
2010-11-17
Junio C Ham
a
no
M
e
rge branch
'
tc/smart-http-post-redirect' into next
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio C Haman
o
Mer
g
e branch 'en/mer
g
e-rec
u
rsive' i
n
to next
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
M
e
rge branc
h
'm
a
ster' into next
commit
|
commitdiff
|
tree
2010-11-17
Junio C Ha
m
ano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-11-17
Bria
n
Gernhardt
t
6
0
2
2
:
Use
-
eq not = to test out
p
u
t of wc -l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Nguyễn Thá
i
Ng
ọ
c
Duy
clean: remove redu
n
d
a
nt variable
basele
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Her
l
and
Pr
o
vide 'g
i
t
m
erge --abort
'
as
a
synonym to 'git reset
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge(): Par
s
e o
p
ti
o
ns before che
c
king
M
ER
G
E_HEAD
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Pr
o
vide 'gi
t
notes ge
t
-re
f
' to e
a
s
i
ly re
t
rieve
c
urrent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge: Add test
c
a
ses for
me
r
ging notes trees
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add anot
h
er a
u
to-res
o
lving
strategy
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
no
t
es
m
erge
:
--co
m
mit
sho
u
ld fail
i
f
unde
r
lying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herla
n
d
git notes merge: List c
o
nflicting notes in notes merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
g
i
t notes merge
:
Manual conflict res
o
l
ution, part 2/2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
rlan
d
git notes merge: Manual
c
onflict
r
esolution, part 1/2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
D
o
cumentation:
P
r
eliminary doc
s
on 'git notes merge'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merg
e
: Add automatic conflic
t
resolvers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git
n
otes merge:
Handle real, non-
c
onflicti
n
g notes
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
builtin/not
e
s
.
c: Refactor creation of no
t
es commi
t
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
git notes m
e
rge: Ini
t
ial imple
m
entation ha
n
dli
n
g triv
i
al
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next