repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
user-manual: describe how higher stages are set during a merge
2008-06-12
Junio C Hamano
user-manual:
describe how highe
r
stages
a
re set during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-12
Junio
C Haman
o
D
ocu
m
entation: exclud
e
@
p
x
ref{[REMOT
E
S]}
from te
x
i
nfo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-12
Junio
C
Ham
a
no
Documen
t
ation/git-
p
ull
.
txt
:
Use more standard [NOTE
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-11
J
u
nio C Ham
a
no
M
e
r
ge git://git
.
kerne
l
.
org/pub/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2008-06-11
Juni
o
C Hamano
Merge branch '
m
aint
'
commit
|
commitdiff
|
tree
2008-06-09
J
u
n
io C Hamano
Me
r
ge branch 'js/merge-recu
r
s
ive'
commit
|
commitdiff
|
tree
2008-06-09
Juni
o
C Hama
n
o
Mer
g
e br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2008-06-08
Junio C Hamano
http-push
.
c: remove dup
l
i
cated
cod
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-07
Junio
C Hamano
GIT 1
.
5
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-07
Jun
i
o C Hamano
Merg
e
1
.
5
.
5
.
4 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-07
J
u
nio C
H
am
a
n
o
G
IT 1
.
5
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-06
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-04
Junio C Ha
m
a
n
o
Merge
bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-06-04
Junio C Ham
a
no
t
7502:
hon
o
r SHELL_PATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-04
Jun
i
o C Hamano
D
o
cum
e
ntation
:
gi
t
-
log canno
t
u
s
e
r
ev-li
s
t s
p
e
c
ific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-04
J
u
nio
C
H
amano
t750
2
: tighten
l
o
osely written test se
q
u
e
nce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-04
Juni
o
C
H
amano
t7502: do not gl
o
bally un
s
et
GIT_COMMIT
T
ER_*
env
i
ronment
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-03
J
un
i
o C Hamano
G
I
T
v1
.
5
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-03
Junio C
H
amano
com
m
it
:
drop duplica
t
e
d parent
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-02
Jun
i
o C Hamano
Mer
g
e branc
h
'sb/am-test
s
'
commit
|
commitdiff
|
tree
2008-06-02
Junio
C
H
a
mano
Merge b
r
a
n
c
h
'
lw/tes
t
-
f
ix'
commit
|
commitdiff
|
tree
2008-06-02
Ju
n
io C Hamano
M
erge bra
n
ch 'sp/
r
emote'
commit
|
commitdiff
|
tree
2008-06-02
Junio C
H
a
mano
Me
r
ge b
r
anch 'lt/pack-s
y
nc'
commit
|
commitdiff
|
tree
2008-06-02
Junio C H
a
mano
M
e
rge bran
c
h 'n
p
/pack-
c
heck
'
commit
|
commitdiff
|
tree
2008-06-02
Junio
C Hamano
Me
r
ge branch 'jb/re
s
et-q'
commit
|
commitdiff
|
tree
2008-06-02
Jun
i
o C Hamano
Merge branc
h
'jc/ch
e
ckout'
commit
|
commitdiff
|
tree
2008-06-02
Jun
i
o C Ha
m
ano
Merge branch
'lr/
i
nit
-
bare'
commit
|
commitdiff
|
tree
2008-05-30
J
unio C Hamano
checkout
:
"best effort" che
c
kou
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-30
Junio C Hamano
unpack_trees
(
):
a
llow
c
allers t
o
differentiate worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-30
J
u
nio
C H
a
mano
c
heckou
t
: c
o
nsolidate reset_{to_n
e
w,c
l
ean_to_new}()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-29
Junio C Ha
m
ano
checkout:
m
ake reset_cle
a
n_to
_
new() not die by itself
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-29
Jun
i
o C Hamano
"g
i
t
checkout
-
-
paths
.
.
.
" should error out when paths
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-29
Jun
i
o C Ha
m
a
no
Documentation: git-che
r
ry
u
ses git
-
patch-id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-28
Junio C Hamano
Manual subsection to ref
e
r to other pages is
SEE ALSO
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-28
J
u
nio C Hamano
f
i
x sha1_pack_index_name()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-28
Junio C Hamano
Git::cat_blob: all
o
w using an
e
mpty blob to f
i
x
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-28
Junio C
Hamano
t5100:
A
voi
d
f
i
len
a
me
"nu
l
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-28
Ju
n
io C Haman
o
Me
r
ge 1
.
5
.
5
.
3 in
commit
|
commitdiff
|
tree
2008-05-28
Junio C Hamano
GIT
1
.
5
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-27
Jun
i
o
C
H
amano
Merge bra
n
ch 'jc/
d
if
f
-n
o
-
no-i
n
dex'
commit
|
commitdiff
|
tree
2008-05-27
Junio C Hama
n
o
g
it
diff
--no-in
d
ex
:
default to pa
g
e
l
ik
e
other
di
f
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-27
Junio C Haman
o
g
i
t-
d
iff: allow --no-ind
e
x semantics a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-27
Ju
n
io C
Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-05-27
Junio C
H
amano
Merge branch 'gp/bisect-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2008-05-27
Junio
C
Hamano
Merge git
:
//re
p
o
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-05-26
Junio C Hama
n
o
show-br
a
nch --cur
r
ent:
do no
t
barf o
n
d
e
t
ached H
E
AD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-26
J
uni
o
C Hamano
Makefile: fix depende
n
c
y
on wt
-
st
a
tus
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-26
Junio C Haman
o
Documentation/git
.
txt: link to 1
.
5
.
5
.
2 d
o
cumenta
t
ion
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-26
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-05-26
Junio C Hamano
Merg
e
branch 'jk/ma
i
nt-sen
d
-ema
i
l-compose' into maint
commit
|
commitdiff
|
tree
2008-05-26
J
u
nio C Hamano
Merge branch 'hb/maint
-
send-email-quote-recip
i
e
nts
.
.
.
commit
|
commitdiff
|
tree
2008-05-26
J
u
nio C Hamano
Merg
e
branch '
m
aint-
1
.
5
.
4
'
into
m
aint
commit
|
commitdiff
|
tree
2008-05-26
Junio C
H
amano
Release Notes for 1
.
5
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-26
Junio C Hamano
log --pretty: do n
o
t
accept bogu
s
"--prettysh
o
rt
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-26
Junio C Ham
a
no
log --
g
ra
p
h: do not accept
log
-
-grap
h
bogus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-26
Junio C Hamano
Update draf
t
release notes
f
o
r
1
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-25
Jun
i
o C Hamano
M
erge branch
'js/config-cb'
commit
|
commitdiff
|
tree
2008-05-25
Junio C Hamano
Merge branch 'a
s
/graph'
commit
|
commitdiff
|
tree
2008-05-25
Junio C Ham
a
no
Merge branch 'js/mailinfo'
commit
|
commitdiff
|
tree
2008-05-25
Junio C Hamano
Merge bra
n
ch
'
j
c
/
add-n-u'
commit
|
commitdiff
|
tree
2008-05-25
Jun
i
o C Ham
a
no
Merge branch 'ar/t6
0
31
'
commit
|
commitdiff
|
tree
2008-05-25
Junio C Ha
m
ano
M
e
r
g
e branch 'd
b
/clone-in-c'
commit
|
commitdiff
|
tree
2008-05-25
Junio C Hamano
Mer
g
e branch 'jc/apply-whitespace'
commit
|
commitdiff
|
tree
2008-05-25
J
unio
C
Hamano
Merge
b
ranch
'jc
/
unpack-tr
e
e
s-reword'
commit
|
commitdiff
|
tree
2008-05-25
Junio C H
a
man
o
Merge bra
n
ch
'ar/batch-cat'
commit
|
commitdiff
|
tree
2008-05-25
Ju
n
io C Ham
a
no
Merge branch 'cc/bisect'
commit
|
commitdiff
|
tree
2008-05-25
Junio C Hamano
Merge branch 'ap/svn'
commit
|
commitdiff
|
tree
2008-05-25
J
u
nio C
Hamano
Merge
bran
c
h
'
j
s
/cvs
e
xportcommit'
commit
|
commitdiff
|
tree
2008-05-25
Junio
C
Ham
a
no
Merge br
a
n
c
h 'js/ignor
e
-submo
d
ule'
commit
|
commitdiff
|
tree
2008-05-25
Junio C Hama
n
o
M
erge bran
c
h 'mo/cv
s
serve
r
'
commit
|
commitdiff
|
tree
2008-05-25
Junio
C
H
amano
mail
s
pl
i
t: minor c
l
ean-up in
r
ead_
l
ine_with_nul()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-25
Junio C H
a
mano
mailinfo: a
p
ply the
s
ame fix not to l
o
se NU
L
s in
B
A
S
E
64
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-24
J
unio
C Hamano
"gi
t
diff": do not ignore index w
i
t
hout --n
o
-index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-24
Junio C Hama
n
o
diff-files: do not play --no-index game
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-24
Junio C
H
amano
test
s
: do not use implicit "git diff --n
o
-
i
ndex"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-24
Junio C
H
amano
Merge
git://git
.
kernel
.
org/pub
/
scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2008-05-23
Junio
C
Haman
o
Merge branch 'pb/pu
s
h'
commit
|
commitdiff
|
tree
2008-05-23
Junio C Hamano
M
e
rge
b
ranch 'bc/repack'
commit
|
commitdiff
|
tree
2008-05-23
Junio
C
Hamano
Mer
g
e branch 'sp/ignorecase'
commit
|
commitdiff
|
tree
2008-05-23
J
unio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2008-05-23
Junio C Hamano
M
e
rge
branch 'maint-1
.
5
.
4' into maint
commit
|
commitdiff
|
tree
2008-05-21
J
unio
C
H
a
mano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2008-05-21
Junio C H
a
mano
Merge branch 'ma
i
n
t
-1
.
5
.
4' i
n
to maint
commit
|
commitdiff
|
tree
2008-05-21
Jun
i
o
C H
a
mano
Merg
e
bra
n
ch 'a
r
/ad
d
-unreadable'
commit
|
commitdiff
|
tree
2008-05-21
Junio
C
H
a
mano
Merge branch '
d
s
/
br
a
nch
-
auto-reb
a
se'
commit
|
commitdiff
|
tree
2008-05-21
Junio C Hama
n
o
M
erge b
r
a
nch 'sv/fir
s
t
-
paren
t
'
commit
|
commitdiff
|
tree
2008-05-21
Junio C Hamano
M
erge branch
'
np/pack
'
commit
|
commitdiff
|
tree
2008-05-21
Junio
C
Hama
n
o
M
e
rg
e
branch 'as/graph'
commit
|
commitdiff
|
tree
2008-05-21
Junio
C
Hamano
Merge bran
c
h 'jk/main
t
-send-
e
mail-c
o
mpose
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-21
Junio C Hamano
Merge branch
'
hb/maint-send-email-quote-rec
i
p
i
ents'
commit
|
commitdiff
|
tree
2008-05-21
Junio C
H
amano
"git-add -n -u
"
should not add but ju
s
t repo
r
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-20
J
u
nio C Hamano
unpack-
t
rees: allow Porc
e
lain to give diffe
r
ent error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-17
Junio C Hamano
buil
t
in-app
l
y: do not declare patch is creat
i
on w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-17
Juni
o
C Ham
a
n
o
bui
l
ti
n
-apply:
a
c
c
e
p
t pa
t
ch to an em
p
ty file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-17
Junio
C
Hamano
builtin-app
l
y: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-05-17
J
un
i
o C Hamano
M
erge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-05-15
Junio C Hamano
Merge g
i
t://repo
.
or
.
c
z
/
git-gui
commit
|
commitdiff
|
tree
2008-05-15
Junio C Hamano
Merge git://git
.
k
ernel
.
org/pub/
s
cm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2008-05-14
Jun
i
o
C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-05-14
Ju
n
io C Ha
m
ano
Merge branch 'maint
-
1
.
5
.
4' in
t
o maint
commit
|
commitdiff
|
tree
next