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 branch 'jk/maint-advise-vaddf'
2012-07-09
Jun
i
o C Hamano
apply: docume
n
t
--3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
aman
o
apply: a
l
low rerere() to
work on --3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
apply: register conflicted stages to th
e
i
ndex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
no
apply: --3way with add/add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move verify_index_match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply
:
p
l
u
g
the
t
hree-way me
r
ge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
n
o
apply: fal
l
ba
c
k on th
r
ee-way
m
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: accep
t
-3/--3way command line o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: move "already exists"
l
og
i
c to check_to_c
r
ea
t
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: move check
_
to
_
create_
b
lob() close
r
to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
H
a
m
ano
apply: f
u
rther spli
t
load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refactor "p
r
ev
i
ou
s
pat
c
h
" l
o
gic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
s
plit
l
o
ad_preimage() helpe
r
function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
a
m
ano
apply
:
fa
c
tor out checkout_target() helper
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
a
p
p
ly: refactor read_file_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: cle
a
r_image() cl
e
ars
t
hings a bit mo
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
apply
:
a bit more c
o
mments
o
n P
A
TH_TO_BE_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
man
o
apply
:
f
ix an
i
ncomplete co
m
ment in
c
heck_pat
c
h()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge git://gi
t
hub
.
c
om/git-l10n/git
-
po
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
Fifth
ba
t
ch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
Merge
b
ranch 'cw/help-over-networ
k
'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merge bra
n
ch 'mz/e
m
pty-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
Merge branch 'pw/git-
p
4-tests
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rge bra
n
ch 'j
s
/fast-exp
o
rt-pa
t
hs-
w
ith-spaces'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
M
erge
branc
h
'
c
w/no-detachin
g
-an-unbor
n
'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge branch 'vr/use-o
u
r-perl-in
-
tests
'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
n
o
Mer
g
e b
r
anch 'mm/credential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
Merge branch '
j
c/mai
n
t-bl
a
me-uni
q
ue
-
a
b
brev'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
Merge branch 'jn/perl-makemak
e
r-leading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
Merge branch 'rj/platform-pread-may-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C H
a
m
a
no
Merge branc
h
'mm/c
o
nfig
-
xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
a
mano
Fourth ba
t
ch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
Hamano
Merge
b
ranch
'
nd/clone-
s
i
ngle-
f
ix'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
Haman
o
Merg
e
branch 'th/
d
i
f
f
-
no-
i
ndex-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
io C
H
am
a
no
Merge branch 'hv/remote-end-h
u
ng-up'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1
_
name
.
c: teach get_short_
s
ha1() a commit-on
l
y option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C
H
a
man
o
sha1_n
a
me
.
c: allo
w
get_short_s
h
a1() t
o
take o
t
her flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o
C
H
a
mano
ge
t
_sha1():
fix error status
r
e
gression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C Ham
a
no
sha1_name
.
c: restru
c
ture
disambi
g
uation of short na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sh
a
1_name
.
c: corr
e
ct
misnamed "canoni
c
al" an
d
"res
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ha
m
ano
sha1_nam
e
.
c
: refactor find_short_packed_obj
e
ct()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio
C
Hamano
sha
1
_
n
ame
.
c: rename "n
o
w"
t
o "c
u
r
rent
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C Hamano
sha1_name
.
c: clarify w
h
at "f
a
ke" is
for i
n
find_sh
o
rt_object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hama
n
o
sha1_name
.
c: get rid of
g
et
_
s
ha1_w
i
t
h_mod
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C Haman
o
sha1_nam
e
.
c:
g
et r
i
d of get_sha1_with_mode_1
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
J
u
ni
o
C
H
a
mano
Sync with i18n-
p
o
updates in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
Merge b
r
anch 'mai
n
t' of
g
it://gi
t
hub
.
com/git-
l
10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Jun
i
o C
H
amano
sh
a
1
_na
m
e
.
c: hide get_sha1_with_context_1() ug
l
iness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Ju
n
io C Hamano
blame: compu
t
e abbreviati
o
n width
t
hat ensures uniqueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C
H
amano
diff-index
.
c: "git diff" has no need t
o
read
b
lob from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hamano
diff-index
.
c: un
i
fy handling of com
m
an
d
li
n
e paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
no
d
i
f
f-in
d
ex
.
c:
d
o
n
o
t preten
d
pa
t
hs are pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
Th
i
r
d
b
a
tch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hamano
Merg
e
branc
h
'fc/git-prompt-script'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
no
Merge branch 'js/submodule-relati
v
e'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
a
mano
Merg
e
branc
h
'l
k
/mor
e
-
helpful-status-hints'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
M
e
rge branc
h
'lk/r
e
b
a
s
e
-
i
-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Ha
m
ano
M
e
rge branch 'j
c
/r
e
v-list-simp
l
i
f
y-merge
s
-fir
s
t
-parent'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Merge bra
n
ch 'hv/submodule-upda
t
e-nuke-submod
u
le
s
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
Merge bran
c
h 'nd/e
x
clude-worka
r
ound-
t
o
p
-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
Merge branch 'nd/stream-pack-
o
bjects'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
Merge br
a
nch 'nd/stream-index-p
a
c
k'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch '
m
m/verify-fil
e
name-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
Merge branch 'jk/diff-no-in
d
ex-pager'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Hamano
index-p
a
ck: D
i
sable threading on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
mano
Second batch f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio
C Ha
m
ano
Merge bran
c
h '
l
p/no-cmd-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ha
m
ano
Merge branch
'cn/
c
herry-pick-range-docs
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge b
r
a
n
ch
'
l
m/git-bl
a
me-el'
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C
Hamano
Merge br
a
nch 'r
s
/
i
pv6-ssh-url
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branc
h
'jc/ustar-che
c
ks
u
m-
i
s-unsi
g
ne
d
'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C Hamano
Mer
g
e branch
'
r
s
/git-blam
e
-mapcar
-
mapc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
m
ano
Merge branch 'rr/doc-commi
t
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Haman
o
Merge branch 'nd
/
i
1
8n-misc'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hamano
Merg
e
branch 'nd/
i
18
n
-branch-lego'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C
Ha
m
ano
Merge
b
r
a
n
ch 'jk/n
o
-more-asciidoc7'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
t/README:
add a bi
t
more
D
on
'
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
t
es
t
s: enclose $PER
L
_PATH in dou
b
le quotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
t/
t
est-lib
.
sh:
e
xport PERL_PATH for us
e
in script
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-22
Junio C Haman
o
Merge branch
'maint'
commit
|
commitdiff
|
tree
2012-06-22
Jun
i
o C H
a
mano
M
erge b
r
anch
'
vr/help-per-platform'
commit
|
commitdiff
|
tree
2012-06-21
Junio
C Hamano
Sync with 1
.
7
.
11
.
1
commit
|
commitdiff
|
tree
2012-06-21
J
u
nio C
Ham
a
n
o
The
f
i
r
st batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-21
Junio C H
a
mano
G
i
t 1
.
7
.
1
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-21
J
unio C Ha
m
ano
M
erge
bran
c
h 'jk/
m
aint-t1304-se
t
fac
l
'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
Merge br
a
nch
'
vr/help-per-pl
a
tform
'
commit
|
commitdiff
|
tree
2012-06-21
Jun
i
o C Hamano
M
e
rge
branch 'jc/l
s
-
f
iles-i-dir'
commit
|
commitdiff
|
tree
2012-06-21
Ju
n
io C Hama
n
o
Merge b
r
anch 'jk/version-
s
tring'
commit
|
commitdiff
|
tree
2012-06-21
Ju
n
io C Hamano
Merg
e
branch 'jc
/
re
q
uest-pull-match-tagname'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
M
e
rg
e
branch
'
jk/clon
e
-local'
commit
|
commitdiff
|
tree
2012-06-21
J
u
ni
o
C Hama
n
o
Mer
g
e branc
h
'jc/bun
d
l
e-complete-notice'
commit
|
commitdiff
|
tree
2012-06-21
Jun
i
o C Hamano
Kick off post
1
.
7
.
11 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-19
Junio C Hamano
s
how: f
i
x
"range implies walkin
g
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-19
Junio C Haman
o
git-c
o
mmit-tree(1): update
syn
o
psis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-18
Ju
n
io
C
Haman
o
sha
1
_n
a
m
e
.
c
: indentation fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Junio C Hamano
Git
1
.
7
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Ju
n
io C
H
amano
Sync w
i
th 1
.
7
.
10
.
5
commit
|
commitdiff
|
tree
2012-06-17
J
un
i
o
C
Hamano
G
it 1
.
7
.
10
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Junio C Hamano
Merge
b
ra
n
ch
'js/mai
n
t-
f
ast-ex
p
ort-mark-error' into
.
.
.
commit
|
commitdiff
|
tree
next