repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
2008-07-30
Ju
n
io C Ham
a
no
git-m
e
rge-
o
ctopus: use
(me
r
ge-base A (merg
e
B
C D E
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Junio C Ha
m
ano
merge-base-many: add tr
i
vial tests based on the document
a
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Jun
i
o C Hamano
documentation: merge-base:
e
xp
l
ain
"git m
e
rge-base
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Jun
i
o C Hama
n
o
t
7001
:
fix "git mv" te
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Juni
o
C Hamano
Documen
t
ation: clar
i
fy what is
s
hown in "git-ls-files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
J
u
nio
C Ha
m
ano
l
s
-
tree d
o
cume
n
t
a
tion: enhance notes on subdi
r
ectory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Ha
m
ano
Allo
w
installing in
th
e
tradition
a
l wa
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio C
Ha
m
ano
Allow b
u
ilding without any git installed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Ha
m
ano
GIT 1
.
6
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio
C Hamano
ma
k
e sure parsed wildcard refspec en
d
s wi
t
h
s
lash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio
C Hamano
Merg
e
gi
t
:
//repo
.
o
r
.
c
z/git-gui
commit
|
commitdiff
|
tree
2008-07-25
Junio C
Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
D
ocumen
t
ation: clar
i
fy
h
o
w
t
o
disable
e
l
ements
in core
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Jun
i
o C Hamano
Makefile: fix shell qu
o
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
J
u
nio
C Hamano
t
e
s
ts: prop
a
gate
$(T
A
R
)
down from the
toplevel Ma
k
efile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Haman
o
Me
r
g
e
br
a
n
ch 'ph/check
o
ut'
commit
|
commitdiff
|
tree
2008-07-24
Jun
i
o C Hamano
Merge
branch 'maint'
i
nto
p
h/checkout
commit
|
commitdiff
|
tree
2008-07-24
Jun
i
o C Ha
m
ano
ignore non-existent refs
in dwim_log()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C
Hamano
Documentation: clarify diff --cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio
C
Hamano
b
u
iltin
-
branch
.
c
:
opt
i
m
i
ze --merged and --no-me
r
ged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C
Hamano
b
u
i
l
t
i
n-bra
n
ch
.
c
: re
m
ove unused code in append_ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio
C
Ha
m
ano
stash save:
f
ix
p
arame
t
e
r han
d
ling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Juni
o
C Hamano
te
s
ts: do not re
l
y on
e
x
t
ernal "pat
c
h
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Hamano
Revert "make git
-
s
t
atus use a
page
r
"
commit
|
commitdiff
|
tree
2008-07-21
Junio C H
a
mano
Update my e-mail
add
r
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Haman
o
Merge b
r
anch 'a
p
/tr
a
ckin
f
o
'
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
a
mano
Me
r
ge branch 'jc/rerere-auto-more'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Ham
a
no
Mer
g
e branch 'ns/am-abort'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Ha
m
ano
Me
r
ge bra
n
ch 'jc/add
-
addrem
o
ve'
commit
|
commitdiff
|
tree
2008-07-21
J
unio C
H
amano
"
n
eeds up
d
ate" conside
r
e
d harm
f
ul
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Ju
n
i
o
C
Hama
n
o
Move re
a
d_in_full() and write_i
n
_fu
l
l() to wrapper
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C
H
amano
L
i
n
k
s
hell with c
o
mpat
layer functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
M
e
rge bra
n
ch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2008-07-20
Junio C Ha
m
ano
r
e
fresh-index: fi
x
bitm
a
sk assign
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Jun
i
o C Hamano
git-add
-
-a
l
l: d
o
c
umentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
u
nio C Hama
n
o
git-add --all: tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Ju
n
i
o
C
Hamano
git-add --all: add all fil
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
J
u
nio
C Hamano
bui
l
tin-add
.
c: re
s
truc
t
u
r
e the
code
f
or maintainability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
u
nio C Hama
n
o
G
e
tti
n
g clo
s
er
t
o
1
.
6
.
0-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio
C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-07-19
J
u
n
io C H
a
mano
.
mailmap upd
a
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
J
unio C Hamano
t
9001
(
sen
d
-
e
mail): Do
not use
ha
r
dcoded
/
b
i
n/sh in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
GIT 1
.
5
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio
C
Hamano
M
e
r
ge branch 'sp/maint-index-p
a
ck' into maint
commit
|
commitdiff
|
tree
2008-07-18
Juni
o
C Hamano
http-fe
t
ch: do not SEGV after fetching a b
a
d
p
ack idx
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
rev-
l
i
s
t:
honor --quiet
o
pti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
bui
l
t
i
n-re
m
ote
.
c: fix earlier "skip
_
prefix()" conversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o C Ha
m
ano
rer
e
re
.
autoup
d
ate: chang
e
th
e
message when autoupdate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Ju
n
io C Hamano
mailinf
o
: off-by-one
fix for [PATCH (fooba
r
)] r
e
moval
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o
C
Hamano
rea
d
-
cache
.
c:
t
y
p
ofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Update draft release
n
ot
e
s for
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
J
unio
C
Ha
m
an
o
Merge bran
c
h 'mv/dashless'
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
Hama
n
o
Merge branch 'ls/mailinfo'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
amano
Merge b
r
anch 'sb/dash
l
ess'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge branch
'rs/arch
i
ve'
commit
|
commitdiff
|
tree
2008-07-17
J
un
i
o C Hamano
Merge b
r
anch
'ag/blame'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Haman
o
Merge b
r
an
c
h '
r
s/rebase-checkout-not-
s
o
-
quiet
'
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o C
H
amano
Merge branch 'sp/maint-index-pa
c
k'
commit
|
commitdiff
|
tree
2008-07-17
J
un
i
o
C Haman
o
Merge bra
n
ch
'
maint
'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Ha
m
ano
Start prep
a
ri
n
g 1
.
5
.
6
.
4 release
n
otes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C
Haman
o
Merge branch 'js/
m
aint-pret
t
y-mailmap' into maint
commit
|
commitdiff
|
tree
2008-07-16
J
u
n
i
o
C Hamano
Merge branch 'sp/maint-bash
-
completio
n
-optim
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C Hamano
M
e
rge
branc
h
'sp/maint-
p
ack-memuse'
into maint
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C Hamano
Merge branc
h
'l
s
/ma
i
n
t
-mailinfo-patch-label' int
o
maint
commit
|
commitdiff
|
tree
2008-07-16
J
uni
o
C
Hamano
M
erge branch 'js/maint-da
e
mon-sys
l
og'
into main
t
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
a
mano
t/aggregat
e
-results: whitespace f
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio
C Ham
a
no
Merge branch 'mv/merge-in-c'
commit
|
commitdiff
|
tree
2008-07-16
Junio
C
Haman
o
Merge branch 'ag
/
rewrite_o
n
e
'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Hamano
Merge b
r
anch 'sp/win'
commit
|
commitdiff
|
tree
2008-07-16
J
unio C Hamano
Merge b
r
anch
'
j
s/more-win'
commit
|
commitdiff
|
tree
2008-07-16
J
unio C Hamano
Mer
g
e
branch 'js/maint-pr
e
tty-mail
m
ap'
commit
|
commitdiff
|
tree
2008-07-15
J
u
nio C Haman
o
Update draft
r
elease note
s
to 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge gi
t
:
/
/repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-07-15
J
u
nio C Ham
a
no
Merge branch 'js/merge-rr
'
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
H
amano
M
e
rge branch 'sb/rerere
-
lib'
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io C Hamano
Merge branch 'ls/
m
aint-mailinfo-
p
atc
h
-label'
commit
|
commitdiff
|
tree
2008-07-15
Junio C H
a
mano
Merg
e
bra
n
ch 'om
/
r
ere
r
e-carefu
l
'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merg
e
bran
c
h 'jc/branch-
m
erged'
commit
|
commitdiff
|
tree
2008-07-15
J
unio C Hamano
Merg
e
branch
'jc
/
rebase-orig-head'
commit
|
commitdiff
|
tree
2008-07-15
J
u
nio C
Haman
o
Merge branch '
s
p/
m
aint-ba
s
h-completio
n
-opti
m
'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
t
u
to
r
ial: clarify "pull" is "fetch
+ merge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Junio C Ham
a
no
g
i
t-rebase: report c
h
eckout f
a
ilure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Juni
o
C Ham
a
no
reduce_
h
eads(): protect from dupli
c
a
te inp
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Junio C Hamano
Update
d
raft releas
e
notes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Junio
C
Ha
m
a
no
Merge branch '
s
p/maint-bash
-
co
m
p
l
etion-optim'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Haman
o
Merg
e
bra
n
c
h
'maint' to sync with 1
.
5
.
6
.
3
commit
|
commitdiff
|
tree
2008-07-13
Junio C Ha
m
ano
GIT 1
.
5
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Ju
n
i
o C Hamano
Merge branch '
p
h/parseop
t
-step
-
b
l
ame
'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hama
n
o
M
erge br
a
n
ch 'am/st
a
sh-
b
r
a
nch'
commit
|
commitdiff
|
tree
2008-07-13
J
u
nio
C
Hamano
Merge br
a
n
c
h 'sg/
s
t
a
sh-k-i'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Merge branch 'jc/re
p
ort-trackin
g
'
commit
|
commitdiff
|
tree
2008-07-13
Ju
n
io C
H
amano
Merge
b
ran
c
h 'js/pick-root'
commit
|
commitdiff
|
tree
2008-07-13
Junio
C Hamano
Merge branch
'a
b
/
bundle'
commit
|
commitdiff
|
tree
2008-07-13
Junio C
Ha
m
an
o
Me
r
ge branch 'tr/add-i-e'
commit
|
commitdiff
|
tree
2008-07-12
Junio C Hamano
t
0
004: fi
x
timing bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Juni
o
C Ham
a
no
Teach merge
.
log to
"git-mer
g
e" again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Junio C Hamano
appl
y
: fix
copy/re
n
a
me
b
reaka
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Juni
o
C Hamano
Me
r
ge branch 'jk/pa
g
er-config'
commit
|
commitdiff
|
tree
2008-07-09
J
u
n
i
o C Ham
a
no
Merge
branch 'js/apply-
r
o
o
t'
commit
|
commitdiff
|
tree
2008-07-09
J
u
nio C Haman
o
Merg
e
branch 'jc/reflog-expire
'
commit
|
commitdiff
|
tree
next