repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: move the global obuf to struct merge_options
2008-08-31
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io
C Hamano
g
i
t
attributes
:
-c
r
lf is not binar
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
u
n
io C Hamano
g
it-apply:
L
oosen "match_beginning" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
amano
Fi
x
example in git
-
name-rev documenta
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Hamano
Merge branch 'sp/mis
s
i
n
g-t
h
in-base' into maint
commit
|
commitdiff
|
tree
2008-08-30
J
unio C
H
amano
Merg
e
branch 'sb/d
a
emon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ham
a
no
Merge b
r
anch 'af
/
m
a
int-install-no-hand
l
ink' into maint
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
Hamano
shell
:
do not
play duplicated d
e
finiti
o
n
gam
e
s
t
o
s
h
rink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
u
ni
o
C Hamano
Merge
branch 'np
/
verify-pac
k
'
into maint
commit
|
commitdiff
|
tree
2008-08-29
Ju
n
io C H
a
mano
Merge b
r
an
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-28
Junio C
H
amano
Me
r
ge branc
h
'mv
/
me
r
ge
-
cu
s
tom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Ha
m
ano
M
e
rge b
r
anch 'ml/s
u
bmodu
l
e'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C Hamano
Merge branch 'am
/
cherry-pick-rerere'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C H
a
mano
Merge branch 'jc/
a
dd-addremove'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C
Hamano
Merge branch 'n
p
/verify-pack
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
ano
Merge branch 'da/su
b
module-sync'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
ctype
.
c: prot
e
ct tiny C preprocessor constants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Mer
g
e
branch 'af/maint-i
n
sta
l
l-no-hand
l
ink'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
M
e
rge
b
ranch 'jc/n
o
-slim-
s
he
l
l'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C Hamano
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hama
n
o
daem
o
n
.
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 Hamano
Revert "B
u
ild-in "
g
it-shell""
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Hamano
Merge b
r
anch 'jc/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Ha
m
ano
Merge branch 'maint' to sync with
1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
J
u
n
io
C
Hama
n
o
G
I
T
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Haman
o
Merge bran
c
h 'ag/maint-c
o
mbin
e
-dif
f
-
fix' into
maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge b
r
anch 'mv/mai
n
t-merge-f
i
x'
i
n
t
o maint
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hamano
t7606
:
fix custom
m
erge te
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C Hamano
Merge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
merge: fix num
e
rus bugs
aroun
d
"tri
v
ial merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hamano
unpack_t
r
e
es(
)
:
p
rotect the handcra
f
ted in-
c
ore index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
u
nio C Hamano
t
emplates/M
a
kefi
l
e
: ins
t
all is unnece
s
sary, just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hama
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge branch 'ml/submo
d
u
l
e-
f
orea
c
h'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o
C
H
a
mano
Merge b
r
anch 'pm/log-exit-code'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
Merge
br
a
nch 'sb/commit-tree-m
i
nileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
b
ranch 'pb/reflog-d
w
im'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Me
r
g
e branch 'jc/add
-
stop-at-s
y
mlin
k
'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Haman
o
M
e
r
ge branch 'kh/diff-
t
ree'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ham
a
no
Mer
g
e
br
a
nch 'mg/c
o
unt-object
s
'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
i
o
C
Hamano
Merge bran
c
h 'mz/push-ve
r
b
o
s
e'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io
C
H
am
a
no
Merge branch 'jc/inde
x
-extende
d
-flags'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merg
e
br
a
nch '
c
c/merge
-
base-many'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'jc/test-
d
eeper'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
M
e
r
g
e branch
'js/parallel
-
test'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
F
ix
"git-
m
erge -s bogo" help text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
n
io
C Ham
a
no
U
p
d
a
te draf
t
release notes f
o
r
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hama
n
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-20
Ju
n
io C Hamano
Update draft release notes for 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hama
n
o
"git-merge"
:
allow fast
-
f
o
rwar
d
ing in a stat-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Haman
o
completion
:
find o
u
t
s
up
p
ort
e
d merge str
a
tegies correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C
H
amano
f
or-
e
ach-
r
ef: cope
w
ith tags with
incomplete
l
i
nes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
di
f
f
--
c
heck: do
n
ot get confused by new blan
k
l
ines
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Bu
i
ld
-
i
n
"git-shell"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Hamano
Merge branch 'bd/diff-str
b
u
f
'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hama
n
o
Merge b
r
an
c
h 'dp/hash-literally'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Hamano
Merge branch 'js/checkout-d
w
im-
l
ocal'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch 'ph/enable-threaded'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C Ha
m
ano
Merge branch 'jk/pager
-
swap'
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Ha
m
ano
Mer
g
e branch 'rs/ima
p
'
commit
|
commitdiff
|
tree
2008-08-20
Junio C
Hamano
Me
r
ge branch 'js/mingw-stat'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
shell: do not play d
u
pl
i
cated definition games to shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-19
J
unio C Haman
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-19
Junio C
H
a
m
a
no
c
ompat: introduce on_dis
k
_
bytes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Start 1
.
6
.
1
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
J
unio C Hamano
Start 1
.
6
.
0
.
X
m
ainten
a
nce series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
GIT 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Haman
o
Me
r
ge
git-
g
ui 0
.
11
.
0
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
Merge branch 'ak/p4'
commit
|
commitdiff
|
tree
2008-08-17
J
unio C
H
amano
test
s
: use
$
TEST_DIR
E
CTORY to r
e
fer to the t/ directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Hamano
index: future
p
ro
o
f
for "extended"
index e
n
tries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-17
Junio C Ha
m
a
n
o
Merge git
:
/
/git
.
k
ernel
.
o
r
g
/
pub/
s
c
m
/
g
i
tk/gitk
commit
|
commitdiff
|
tree
2008-08-14
Junio C Hamano
xdiff-interface
:
hide the whole
"
xdiff_emit_state"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-14
Juni
o
C Hamano
M
e
r
ge
b
ran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-13
Junio C
H
amano
GI
T
1
.
6
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
Junio C Hamano
Merge bra
n
ch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2008-08-13
Junio C Ha
m
ano
Do no
t
talk about "diff" in r
e
v-l
i
st documen
t
ation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-13
J
u
nio
C Hamano
Merge
g
it://git
.
b
o
g
om
i
p
s
.
org/git-svn
commit
|
commitdiff
|
tree
2008-08-12
Jun
i
o
C
Hamano
di
f
f --check:
d
o
n
o
t u
n
c
onditio
n
ally complain
a
bout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-12
Jun
i
o C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-11
J
unio
C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-11
Junio
C Hamano
Re-
f
ix rev
-
list-optio
n
s documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-11
J
u
nio C Hama
n
o
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-11
Junio C Hamano
Fix d
e
leting re
f
log entries
f
rom HEAD
reflog
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Hamano
Update
d
r
aft RelNote
s
for
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-09
Junio C Hamano
M
e
rge b
r
anch
'ma
i
n
t'
commit
|
commitdiff
|
tree
2008-08-09
J
unio C Hamano
mailinfo:
fix MIME mu
l
ti-part
m
ess
a
ge b
o
u
nda
r
y handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Hamano
GIT-VERSION
-
GE
N
: mark t
h
e version 'dirt
y
' onl
y
if there
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-08
Junio C Hamano
a
s
c
i
idoc
m
arkup fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-07
Junio C Hamano
Me
r
ge b
r
anch 'lt/config-fsy
n
c'
i
nto maint
commit
|
commitdiff
|
tree
2008-08-07
J
u
nio C Hamano
Mer
g
e b
r
anch
'
jc/re
f
log-e
x
pire' int
o
maint
commit
|
commitdiff
|
tree
2008-08-07
Junio C
Hama
n
o
Merge branch 'a
g
/rewrite_one' into ma
i
nt
commit
|
commitdiff
|
tree
2008-08-06
Junio C
H
amano
GIT 1
.
6
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Jun
i
o C Hamano
Sy
n
c
w
ith 1
.
5
.
6
.
5
commit
|
commitdiff
|
tree
2008-08-06
J
u
nio C Ham
a
no
GIT 1
.
5
.
6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
Jun
i
o
C
Haman
o
Files giv
e
n
o
n
the
command
l
in
e
are rela
t
ive to $c
w
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-06
J
unio C Haman
o
M
erge gi
t
:
/
/repo
.
or
.
cz/gi
t
-
gui
commit
|
commitdiff
|
tree
2008-08-06
Junio C Hamano
Merge git://git
.
kernel
.
or
g
/
p
u
b
/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2008-08-06
J
u
ni
o
C Ham
a
no
M
erge
b
r
a
nch
'rs/archive-parse-options'
commit
|
commitdiff
|
tree
next