repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge updated git-gui and gitk that call each other
2008-09-07
Junio C
Ham
a
no
Merge updated git-gui and gitk that call each other
commit
|
commitdiff
|
tree
2008-09-06
J
unio C
Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-09-06
Junio C
Hama
n
o
Update
dr
a
ft release notes
for 1
.
6
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-06
Junio C Haman
o
s
tash: refresh th
e
i
ndex
b
efore decidin
g
if th
e
work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-06
J
u
n
io C Hamano
Mer
g
e br
a
nch 'maint' of git://repo
.
or
.
cz/git-gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
J
u
nio C Haman
o
Me
n
tio
n
the fact that 'git
a
nnotate' is only for backw
a
rd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Ju
n
i
o
C Hamano
"blame -c" should be
co
m
patible with
"
annotate"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Juni
o
C Ha
m
ano
Merge branch 'jc/maint-
l
o
g
-grep'
commit
|
commitdiff
|
tree
2008-09-05
Junio C Haman
o
log
-
-author
/
--c
o
m
m
i
tter
:
real
l
y match only with name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
Junio C Hamano
diff
-
-cumulat
i
ve is a
s
ub-option of --dirsta
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
J
u
nio C Hamano
Up
d
ate draft r
e
lea
s
e
n
otes fo
r
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Junio C
H
a
mano
M
erge branch
'
maint
'
commit
|
commitdiff
|
tree
2008-09-03
Junio
C Hamano
Start 1
.
6
.
0
.
2 ma
i
nte
n
ance cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Ju
n
io
C Hamano
Merg
e
branch 'nd/wor
k
tree' i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2008-09-03
Junio C Ham
a
no
Merge
b
r
anch '
h
o
/
dashless'
i
nto maint
commit
|
commitdiff
|
tree
2008-09-03
Junio C Haman
o
M
e
rge
bran
c
h 'tr/filter-branch'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge br
a
nch 'np/maint-safer-pac
k
'
commit
|
commitdiff
|
tree
2008-09-03
Junio C
Hama
n
o
Merge branch 'rf/man
-
env'
commit
|
commitdiff
|
tree
2008-09-03
J
unio C Ha
m
an
o
Merge branch 'j
c
/
author-nick
n
ame'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge branch
'
dp/pid-uint
m
ax
'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge br
a
nch
'
m
a
i
n
t'
commit
|
commitdiff
|
tree
2008-09-01
Junio C Hamano
Merge
bran
c
h '
t
r/rev-lis
t
-docs' into tr/filt
e
r-branch
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ha
m
ano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
J
unio C
H
ama
n
o
'
git
f
oo'
p
rogram i
d
entifies itsel
f
wi
t
hout
d
a
sh in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Hamano
git c
o
mm
i
t --a
u
thor=
$
name: look $name up
in existing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Hamano
Merge br
a
n
c
h
'
mai
n
t'
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io
C
H
a
ma
n
o
g
i
tattrib
u
tes: -crlf i
s
not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge
b
ranch 'j
c
/post-sim
p
lify' (early part) into
t
r
.
.
.
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
gi
t
-apply
:
Loosen
"
m
a
tch_beginning"
l
ogic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C Hamano
Fi
x
example in gi
t
-name-rev docu
m
entation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branc
h
'sp/missing-thin-base' into maint
commit
|
commitdiff
|
tree
2008-08-30
Junio
C Hamano
Merge bran
c
h
'sb/d
a
emon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
a
mano
Merge
bran
c
h 'af/maint
-
install-no-
h
andlink' i
n
to maint
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C Hamano
shell: do not play du
p
licated
d
efiniti
o
n
g
ames to
sh
r
ink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Me
r
ge branch
'
np/verif
y
-p
a
ck' into
m
aint
commit
|
commitdiff
|
tree
2008-08-29
Jun
i
o C
Ham
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-28
Junio
C Hamano
Merge branch 'mv/merge-custom'
commit
|
commitdiff
|
tree
2008-08-28
Junio
C Hamano
Mer
g
e branch 'ml/submodule'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C Hamano
M
er
g
e
branc
h
'am/cherry-p
i
ck-rere
r
e'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Mer
g
e branc
h
'
j
c/ad
d
-addremove'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge
b
r
a
nch 'np/verif
y
-pack'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o
C
H
amano
Me
r
ge branch 'da/
s
u
b
m
od
u
le-sync'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o
C Hamano
Mer
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ham
a
no
ctype
.
c: pro
t
ect
tiny C prepro
c
essor con
s
t
a
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Haman
o
Merge bra
n
c
h
'af/maint-install-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hama
n
o
Merge branch
'jc
/
no-
s
lim
-
shell'
commit
|
commitdiff
|
tree
2008-08-27
J
u
ni
o
C Hamano
Merg
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-26
Jun
i
o C Hamano
daemon
.
c: minor style
fixup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Haman
o
Revert "Bu
i
l
d-in "git-shell""
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merg
e
b
ranch
'
j
c/no-s
l
im-s
h
ell'
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Hamano
Merge
b
ranch 'm
a
int' to syn
c
with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Ha
m
a
n
o
G
IT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch 'ag/maint-combine-d
i
ff-fix' in
t
o maint
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Haman
o
Merg
e
branch
'
mv/ma
i
nt-me
r
ge-fi
x
' int
o
m
aint
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
t7606:
fix
c
u
sto
m
mer
g
e tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
i
o
C
H
a
m
ano
M
erge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
merge: fix numerus bugs around
"
trivial merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
unpack_trees(): protect the handcrafted in-
c
o
r
e in
d
ex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio
C
Hamano
templ
a
tes/Makefile: in
s
tall
i
s
u
n
nec
e
ssary, ju
s
t us
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
Merge
bra
n
ch 'ml/submodule-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
erge br
a
nch 'pm/log-
e
xit-cod
e
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
mano
Merge
b
ranch
'sb/commit-tr
e
e
-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
branch 'pb
/
reflog-dw
i
m
'
commit
|
commitdiff
|
tree
2008-08-21
J
u
n
io C
H
amano
Mer
g
e
branch 'jc/add-stop-at-symlink'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
M
e
rg
e
br
a
nch 'kh/diff-tree'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C H
a
mano
Merge branch
'
m
g/
c
o
u
n
t
-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Mer
g
e branch 'mz
/
p
u
sh-
v
erbose'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o
C
Hamano
Merge br
a
nch 'jc/index-extende
d
-flag
s
'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Me
r
ge branch 'cc
/
merge-base-many'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
erge
b
ranch '
j
c/test-dee
p
er'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Haman
o
M
erge br
a
nch 'j
s
/para
l
lel-test'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Fix "git-
m
er
g
e -s bogo" help te
x
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Ha
m
ano
Upd
a
te draft release
n
otes for
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hamano
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Update dra
f
t rele
a
se notes f
o
r 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio
C Hamano
"git-merge": allow
f
ast-forw
a
r
di
n
g in
a
s
t
at
-
dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
completion:
f
ind out supported
mer
g
e
strategi
e
s correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C
H
a
mano
for-each-r
e
f:
c
ope
w
ith tags
with incomple
t
e
lin
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
unio C
H
amano
diff --check
:
do not get confused b
y
new blank lines
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io
C
H
a
mano
Build
-
in "
g
it
-
shell"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Ham
a
no
Merge branch 'bd/diff-strbuf'
commit
|
commitdiff
|
tree
2008-08-20
J
uni
o
C Ha
m
ano
Merge branch 'dp
/
hash-literall
y
'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch 'j
s
/check
o
ut-dw
i
m-local
'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Me
r
g
e b
r
an
c
h
'
ph/enabl
e
-threaded'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
M
erge
branc
h
'jk/pager-swap'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hamano
Merge bra
n
ch 'rs/imap'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
Merge branch '
j
s/min
g
w-stat
'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Hamano
shell: do not
p
l
ay duplicated definition gam
e
s t
o
shr
i
nk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
Junio
C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-19
J
u
ni
o
C Ha
m
ano
compa
t
: introduce on_disk_bytes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-18
Juni
o
C Hamano
rev
i
sion --simpl
i
fy-merg
e
s: make
it a no-op
w
ithout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-18
Junio C Hamano
r
evision --simplif
y
-me
r
ges: do
no
t
le
a
ve commits unpr
o
ce
s
sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio
C
Haman
o
Start 1
.
6
.
1 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io C Hamano
Sta
r
t 1
.
6
.
0
.
X maintenance
series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Ju
n
io C Hamano
GIT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
unio
C H
a
mano
Merge git-gui
0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge branch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
Junio
C Ha
m
ano
tests: use $TEST_DIRECT
O
RY
t
o refer to the t/ dir
e
ctory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
index: future proof for "extended" index entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next