~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-security
» Revision
31
: debian/changelog.upstream
« back to all changes in this revision
Viewing changes to debian/changelog.upstream
- browse files at revision 31
- compare with another revision
- download diff
- download tarball
- view history from revision 31
- Committer: Package Import Robot
- Author(s): Gerrit Pape
- Date: 2007-10-04 08:27:01 UTC
- mfrom: (1.1.23)
- Revision ID: package-import@ubuntu.com-20071004082701-rsd058ontoqz4i30
Tags: 1:1.5.3.4-1
new upstream point release (closes: #445188).
- files added:
- Documentation/RelNotes-1.5.3.1.txt
- contrib/p4import
- contrib/patches
- contrib/stats
- t/t7004
- t/t7500
- t/t9115
- files removed:
- Documentation/core-intro.txt
- files modified:
- .gitignore
added
removed
debian/changelog.upstream
1
Version v1.5.3.4; changes since v1.5.3.3:
2
-----------------------------------------
3
4
Andy Parkins (1):
5
post-receive-hook: Remove the From field from the generated email header so that the pusher's name is used
6
7
Carl Worth (1):
8
Add test case for ls-files --with-tree
9
10
Federico Mena Quintero (4):
11
Say when --track is useful in the git-checkout docs.
12
Add documentation for --track and --no-track to the git-branch docs.
13
Note that git-branch will not automatically checkout the new branch
14
Make git-pull complain and give advice when there is nothing to merge with
15
16
Jari Aalto (1):
17
git-remote: exit with non-zero status after detecting errors.
18
19
Jean-Luc Herren (2):
20
git-add--interactive: Allow Ctrl-D to exit
21
git-add--interactive: Improve behavior on bogus input
22
23
Jeff King (1):
24
diffcore-rename: cache file deltas
25
26
Johan Herland (1):
27
Mention 'cpio' dependency in INSTALL
28
29
Johannes Schindelin (2):
30
rebase -i: squash should retain the authorship of the _first_ commit
31
Fix typo in config.txt
32
33
Junio C Hamano (5):
34
Whip post 1.5.3.3 maintenance series into shape.
35
git-commit: initialize TMP_INDEX just to be sure.
36
for-each-ref: fix %(numparent) and %(parent)
37
rename diff_free_filespec_data_large() to diff_free_filespec_blob()
38
GIT 1.5.3.4
39
40
Keith Packard (1):
41
Must not modify the_index.cache as it may be passed to realloc at some point.
42
43
Miklos Vajna (1):
44
git stash: document apply's --index switch
45
46
Robert Schiele (1):
47
the ar tool is called gar on some systems
48
49
Steffen Prohaska (1):
50
fixed link in documentation of diff-options
51
52
53
Version v1.5.3.3; changes since v1.5.3.2:
54
-----------------------------------------
55
56
Carlos Rica (1):
57
Move make_cache_entry() from merge-recursive.c into read-cache.c
58
59
Dan Nicholson (1):
60
quiltimport: Skip non-existent patches
61
62
David Brown (1):
63
Detect exec bit in more cases.
64
65
David Kastrup (1):
66
Supplant the "while case ... break ;; esac" idiom
67
68
Eric Wong (1):
69
git-svn: don't attempt to spawn pager if we don't want one
70
71
Glenn Rempe (1):
72
Fixed minor typo in t/t9001-send-email.sh test command line.
73
74
J. Bruce Fields (1):
75
user-manual: don't assume refs are stored under .git/refs
76
77
Jakub Narebski (2):
78
gitweb: Remove parse_from_to_diffinfo code from git_patchset_body
79
gitweb: No difftree output for trivial merge
80
81
Jim Meyering (2):
82
unexpected Make output (e.g. from --debug) causes build failure
83
Do not over-quote the -f envelopesender value.
84
85
Johannes Schindelin (1):
86
apply: get rid of --index-info in favor of --build-fake-ancestor
87
88
Johannes Sixt (2):
89
gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' interaction.
90
gitattributes.txt: Be more to the point in the filter driver description.
91
92
Junio C Hamano (3):
93
Documentation/git-lost-found.txt: drop unnecessarily duplicated name.
94
Mergetool generating blank files (1.5.3)
95
GIT 1.5.3.3
96
97
Linus Torvalds (1):
98
Fix revision log diff setup, avoid unnecessary diff generation
99
100
Matt Kraai (2):
101
Move the paragraph specifying where the .idx and .pack files should be
102
Conjugate "search" correctly in the git-prune-packed man page.
103
104
Michael Smith (1):
105
user-manual: Explain what submodules are good for.
106
107
Miklos Vajna (2):
108
User Manual: add a chapter for submodules
109
git-bundle: fix commandline examples in the manpage
110
111
Randy Dunlap (1):
112
core-tutorial: correct URL
113
114
Shawn Bohrer (1):
115
Fix spelling of overridden in documentation
116
117
Theodore Ts'o (2):
118
mergetool: fix emerge when running in a subdirectory
119
mergetool: Fix typo in options passed to kdiff3
120
121
122
Version v1.5.3.2; changes since v1.5.3.1:
123
-----------------------------------------
124
125
Alexandre Julliard (1):
126
hooks--update: Explicitly check for all zeros for a deleted ref.
127
128
Benoit Sigoure (1):
129
Add test to check recent fix to "git add -u"
130
131
Carlos Rica (1):
132
git-tag -s must fail if gpg cannot sign the tag.
133
134
David Kastrup (1):
135
git-send-email.perl: Add angle brackets to In-Reply-To if necessary
136
137
Dmitry V. Levin (2):
138
Makefile: Add cache-tree.h to the headers list
139
git-commit: Disallow amend if it is going to produce an empty non-merge commit
140
141
Eric Wong (3):
142
git-svn: fix "Malformed network data" with svn:// servers
143
git-svn: understand grafts when doing dcommit
144
Documentation/git-svn: updated design philosophy notes
145
146
Gerrit Pape (2):
147
git-gui: lib/index.tcl: handle files with % in the filename properly
148
git-clone: improve error message if curl program is missing or not executable
149
150
J. Bruce Fields (13):
151
user-manual: adjust section levels in "git internals"
152
user-manual: move object format details to hacking-git chapter
153
user-manual: rename "git internals" to "git concepts"
154
user-manual: create new "low-level git operations" chapter
155
user-manual: rewrite index discussion
156
user-manual: reorder commit, blob, tree discussion
157
user-manual: rewrite object database discussion
158
user-manual: move packfile and dangling object discussion
159
user-manual: fix introduction to packfiles
160
user-manual: todo updates and cleanup
161
documentation: replace Discussion section by link to user-manual chapter
162
core-tutorial: minor cleanup
163
git-apply: fix whitespace stripping
164
165
Jari Aalto (1):
166
Documentation/git-archive.txt: a couple of clarifications.
167
168
Jean-Luc Herren (1):
169
stash: end index commit log with a newline
170
171
Jeff King (1):
172
git-push: documentation and tests for pushing only branches
173
174
Johannes Schindelin (2):
175
revision walker: --cherry-pick is a limited operation
176
apply --index-info: fall back to current index for mode changes
177
178
Junio C Hamano (13):
179
git-apply: do not read past the end of buffer
180
git-add -u: do not barf on type changes
181
git-format-patch --in-reply-to: accept <message@id> with angle brackets
182
diff --no-index: do not forget to run diff_setup_done()
183
Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot
184
Split grep arguments in a way that does not requires to add /dev/null.
185
git-sh-setup: typofix in comments
186
send-email: make message-id generation a bit more robust
187
git-commit: Allow partial commit of file removal.
188
git-commit: partial commit of paths only removed from the index
189
Document ls-files --with-tree=<tree-ish>
190
t/t4014: test "am -3" with mode-only change.
191
GIT 1.5.3.2
192
193
Linus Torvalds (1):
194
Fix the rename detection limit checking
195
196
Matthias Urlichs (1):
197
git-svnimport: Use separate arguments in the pipe for git-rev-parse
198
199
Michael Smith (1):
200
(cvs|svn)import: Ask git-tag to overwrite old tags.
201
202
Michele Ballabio (2):
203
git-gui: show unstaged symlinks in diff viewer
204
git-gui: handle "deleted symlink" diff marker
205
206
Mike Ralphson (1):
207
Documentation / grammer nit
208
209
Nicolas Pitre (1):
210
fix doc for --compression argument to pack-objects
211
212
Pierre Habouzit (1):
213
Fix lapsus in builtin-apply.c
214
215
Ramsay Allan Jones (1):
216
Fix a test failure (t9500-*.sh) on cygwin
217
218
Shawn O. Pearce (17):
219
git-gui: Correct starting of git-remote to handle -w option
220
git-gui: Fix detaching current branch during checkout
221
git-gui: Properly set the state of "Stage/Unstage Hunk" action
222
Don't allow contrib/workdir/git-new-workdir to trash existing dirs
223
Cleanup unnecessary file modifications in t1400-update-ref
224
Include a git-push example for creating a remote branch
225
git-gui: Disable Tk send in all git-gui sessions
226
git-gui: Avoid use of libdir in Makefile
227
git-gui: Assume untracked directories are Git submodules
228
git-gui: Trim trailing slashes from untracked submodule names
229
Make --no-thin the default in git-push to save server resources
230
git-gui: Don't delete send on Windows as it doesn't exist
231
git-gui: Make backporting changes from i18n version easier
232
git-gui: Font chooser to handle a large number of font families
233
git-gui: Provide 'uninstall' Makefile target to undo an installation
234
git-gui: Paper bag fix "Commit->Revert" format arguments
235
git-gui: Disable native platform text selection in "lists"
236
237
Sven Verdoolaege (1):
238
git-diff: don't squelch the new SHA1 in submodule diffs
239
240
Ulrik Sverdrup (1):
241
Remove duplicate note about removing commits with git-filter-branch
242
243
Väinö Järvelä (1):
244
Fixed update-hook example allow-users format.
245
246
247
Version v1.5.3.1; changes since v1.5.3:
248
---------------------------------------
249
250
Junio C Hamano (2):
251
Typofix: 1.5.3 release notes
252
GIT 1.5.3.1: obsolete git-p4 in RPM spec file.
253
254
255
Version v1.5.3; changes since v1.5.3-rc7:
256
-----------------------------------------
257
258
Alex Riesen (1):
259
Temporary fix for stack smashing in mailinfo
260
261
Carlos Rica (1):
262
git-tag: Fix -l option to use better shell style globs.
263
264
Eric Wong (1):
265
git-svn: fix dcommit clobbering upstream when committing multiple changes
266
267
Giuseppe Bilotta (2):
268
git-filter-branch: more detailed USAGE
269
git-filter-branch: document --original option
270
271
Joe Perches (1):
272
git-send-email --cc-cmd
273
274
Johannes Schindelin (5):
275
completion: also complete git-log's --left-right and --cherry-pick option
276
filter-branch: fix remnants of old syntax in documentation
277
rebase -i: mention the option to split commits in the man page
278
filter-branch: provide the convenience functions also for commit filters
279
filter-branch: introduce convenience function "skip_commit"
280
281
Johannes Sixt (1):
282
rebase -m: Fix incorrect short-logs of already applied commits.
283
284
Junio C Hamano (13):
285
git-daemon(1): assorted improvements.
286
ls-files --error-unmatch: do not barf if the same pattern is given twice.
287
Makefile: do not allow gnu make to remove test-*.o files
288
filter-branch: make sure orig_namespace ends with a single slash.
289
git-init: autodetect core.symlinks
290
Make "git-log --" without paths behave the same as "git-log" without --
291
Hopefully the final update to draft release notes for 1.5.3.
292
git-svn: Protect against "diff.color = true".
293
git-diff: resurrect the traditional empty "diff --git" behaviour
294
Avoid one-or-more (\+) non BRE in sed scripts.
295
Documentation: minor AsciiDoc mark-up fixes.
296
Update my contact address as the maintainer.
297
GIT 1.5.3
298
299
Luben Tuikov (1):
300
URL: allow port specification in ssh:// URLs
301
302
Miles Bader (1):
303
Make git-archimport log entries more consistent
304
305
Nicolas Pitre (1):
306
fix same sized delta logic
307
308
Paul Mackerras (1):
309
gitk: Fix bug causing undefined variable error when cherry-picking
310
311
Robin Rosenberg (1):
312
Mention -m as an abbreviation for --merge
313
314
Shawn O. Pearce (1):
315
Teach bash about completing arguments for git-tag
316
317
Tom Clarke (1):
318
Fixing comment in merge strategies
319
320
321
Version v1.5.3-rc7; changes since v1.5.3-rc6:
322
---------------------------------------------
323
324
Alex Riesen (1):
325
Fix git-remote for ActiveState Perl
326
327
Alexandre Julliard (1):
328
git.el: Avoid a lisp error when there's no current branch (detached HEAD).
329
330
Brian Hetro (5):
331
Documentation: For consistency, use CVS instead of cvs.
332
Documentation: Correct various misspellings and typos.
333
Make usage documentation for git-am consistent.
334
Make usage documentation for git-add consistent.
335
When nothing to git-commit, honor the git-status color setting.
336
337
David Kastrup (4):
338
diff-delta.c: Fix broken skip calculation.
339
Documentation/user-manual.txt: fix a few omissions of gitlink commands.
340
Documentation/user-manual.txt: fix a few omissions of gitlink commands.
341
git-svn.txt: fix an obvious misspelling.
342
343
David Kågedal (1):
344
git.el: Added colors for dark background
345
346
Eric Wong (2):
347
git-svn: update documentation with CAVEATS section
348
git-svn: dcommit prints out the URL to be committed to
349
350
J. Bruce Fields (5):
351
user-manual: edit "ignoring files" for conciseness
352
user-manual: minor editing for conciseness
353
user-manual: introduce the word "commit" earlier
354
user-manual: use pithier example commit
355
user-manual: fix incorrect header level
356
357
Jakub Narebski (1):
358
gitweb: Fix escaping HTML of project owner in 'projects_list' and
359
360
Jari Aalto (1):
361
git-tag(1): Remove duplicate text
362
363
Johannes Schindelin (2):
364
rebase -i: fix squashing corner case
365
name-rev: Fix non-shortest description
366
367
Junio C Hamano (11):
368
blame: check return value from read_sha1_file()
369
pack-objects: check return value from read_sha1_file()
370
RelNotes draft for 1.5.3 update.
371
Fix initialization of a bare repository
372
git --bare cmd: do not unconditionally nuke GIT_DIR
373
git-merge: do up-to-date check also for all strategies
374
Porcelain level "log" family should recurse when diffing.
375
"format-patch --root rev" is the way to show everything.
376
Documentation/git-diff: A..B and A...B cannot take tree-ishes
377
format-patch documentation: reword to hint "--root <one-commit>" more clearly
378
GIT 1.5.3-rc7
379
380
Linus Torvalds (1):
381
Fix racy-git handling in git-write-tree.
382
383
Mike Hommey (1):
384
Describe two-dot and three-dot notation for diff endpoints.
385
386
Petr Baudis (4):
387
gitweb: Fix searchbox positioning
388
gitweb: Lift any characters restriction on searched strings
389
git-add: Make the "tried to add ignored file" error message less confusing
390
git-add: Make the filename globbing note a bit clearer
391
392
Quy Tonthat (1):
393
Fix breakage in git-rev-list.txt
394
395
René Scharfe (1):
396
Documentation: update tar.umask default
397
398
Sean Estabrooks (1):
399
Reset terminal attributes when terminating git send-email
400
401
Shawn O. Pearce (13):
402
git-gui: Fix window manager problems on ion3
403
git-gui: Allow git-merge to use branch names in conflict markers
404
git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu
405
git-gui: Fix "unoptimized loading" to not cause git-gui to crash
406
Fix new-workdir (again) to work on bare repositories
407
Suggest unsetting core.bare when using new-workdir on a bare repository
408
Update bash completion with new 1.5.3 command line options
409
Teach bash to complete ref arguments to git-describe
410
Teach bash about git-submodule and its subcommands
411
git-gui: Refactor diff pane popup support for future improvements
412
git-gui: Do not offer to stage three-way diff hunks into the index
413
git-gui: Correct 'git gui blame' in a subdirectory
414
Don't segfault if we failed to inflate a packed delta
415
416
Simon Hausmann (2):
417
git-p4: Make 'git-p4 branches' work after an initial clone with git clone from an origin-updated repository.
418
git-p4: Fix warnings about non-existant refs/remotes/p4/HEAD ref when running git-p4 sync the first time after a git clone.
419
420
Stefan Sperling (1):
421
Document -u option in git-svnimport man page
422
423
martin f. krafft (2):
424
git-svn init/clone --stdlayout option to default-init trunk/tags/branches
425
Install man3 manpages to $PREFIX/share/man/man3 even for site installs
426
427
428
Version v1.5.3-rc6; changes since v1.5.3-rc5:
429
---------------------------------------------
430
431
Alex Riesen (2):
432
Fix whitespace in "Format of STDIN stream" of fast-import
433
Avoid using va_copy in fast-import: it seems to be unportable.
434
435
Arjen Laarhoven (2):
436
gitk: Make the date/time display configurable
437
t1301-shared-repo.sh: fix 'stat' portability issue
438
439
Brian Downing (1):
440
Clarify actual behavior of 'git add' and ignored files
441
442
Brian Gernhardt (1):
443
Minor clarifications to git-filter-branch usage and doc
444
445
Dave Watson (1):
446
Fix misspelling of 'suppress' in docs
447
448
Eric Wong (1):
449
git-svn: fix log with single revision against a non-HEAD branch
450
451
Johannes Sixt (1):
452
gitk: Handle 'copy from' and 'copy to' in diff headers.
453
454
Junio C Hamano (10):
455
Fix "git add -u" data corruption.
456
GIT 1.5.2.5
457
Fix read-tree merging more than 3 trees using 3-way merge
458
Update documentation links for older releases.
459
git-clone: allow --bare clone
460
Documentation/git-rebase: fix an example
461
Clean-up read-tree error condition.
462
fast-import pull request
463
git clone: do not issue warning while cloning locally across filesystems
464
GIT 1.5.3-rc6
465
466
Lars Hjemli (1):
467
git-submodule: re-enable 'status' as the default subcommand
468
469
Linus Torvalds (2):
470
Make thin-pack generation subproject aware.
471
Take binary diffs into account for "git rebase"
472
473
Lukas Sandström (1):
474
Add the word reflog to Documentation/config.txt:core.logAllRefUpdates
475
476
Mark Levedahl (1):
477
git-completion.bash - add support for git-bundle
478
479
Matthieu Moy (1):
480
Add and document a global --no-pager option for git.
481
482
Mike Hommey (1):
483
Clarify commit-tree documentation
484
485
Nicolas Pitre (1):
486
pack-objects: remove bogus arguments to delta_cacheable()
487
488
Paul Mackerras (3):
489
gitk: Fix warning when removing a branch
490
gitk: Fix bug in fix for warning when removing a branch
491
gitk: Add a window to list branches, tags and other references
492
493
René Scharfe (1):
494
path-list.c: always free strdup'ed paths
495
496
Salikh Zakirov (1):
497
git-add -u paths... now works from subdirectory
498
499
Sean Estabrooks (1):
500
Fix small typo in git send-email man page.
501
502
Shawn O. Pearce (11):
503
git-gui: Avoid Tcl error in popup menu on diff viewer
504
Actually allow TAG_FIXUP branches in fast-import
505
Use handy ALLOC_GROW macro in fast-import when possible
506
Teach fast-import to ignore lines starting with '#'
507
Make trailing LF following fast-import `data` commands optional
508
Make trailing LF optional for all fast-import commands
509
Allow frontends to bidirectionally communicate with fast-import
510
Generate crash reports on die in fast-import
511
Include recent command history in fast-import crash reports
512
Correct documentation of 'reflog show' to explain it shows HEAD
513
Don't allow combination of -g and --reverse as it doesn't work
514
515
Steffen Prohaska (1):
516
gitk: Let user easily specify lines of context in diff view
517
518
Steven Grimm (1):
519
Document what the stage numbers in the :$n:path syntax mean.
520
521
Sven Verdoolaege (1):
522
git-apply: apply submodule changes
523
524
Väinö Järvelä (1):
525
git-gui: Added support for OS X right click
526
527
528
Version v1.5.3-rc5; changes since v1.5.3-rc4:
529
---------------------------------------------
530
531
Adam Roben (1):
532
Documentation/git-svn: how to clone a git-svn-created repository
533
534
Alberto Bertogli (1):
535
Allow git-svnimport to take "" as the trunk directory.
536
537
Alex Riesen (3):
538
Fix filehandle leak in "git branch -D"
539
gitk: Continue and show error message in new repos
540
gitk: Show an error and exit if no .git could be found
541
542
Alexandre Julliard (3):
543
git.el: Add support for interactive diffs.
544
git.el: Always set the current directory in the git-diff buffer.
545
git-add: Add support for --refresh option.
546
547
Brian Downing (2):
548
cvsserver: Fix for work trees
549
Add read_cache to builtin-check-attr
550
551
Brian Gernhardt (1):
552
Fix t5701-clone-local for white space from wc
553
554
Carlos Rica (3):
555
Make git tag a builtin.
556
builtin-tag.c: Fix two memory leaks and minor notation changes.
557
Make verify-tag a builtin.
558
559
David Kastrup (6):
560
Documentation/git-commit.txt: correct bad list formatting.
561
Add support for an info version of the user manual
562
INSTALL: explain info installation and dependencies.
563
Documentation/Makefile: remove cmd-list.made before redirecting to it.
564
git-sh-setup.sh: make GIT_DIR absolute
565
Add a test for git-commit being confused by relative GIT_DIR
566
567
Gerrit Pape (1):
568
git-am: initialize variable $resume on startup
569
570
J. Bruce Fields (4):
571
user-manual: update for new default --track behavior
572
user-manual: mention git-gui
573
documentation: use the word "index" in the git-add manual page
574
documentation: use the word "index" in the git-commit man page
575
576
Jakub Narebski (1):
577
gitweb: Fix handling of $file_name in feed generation
578
579
Johannes Schindelin (4):
580
launch_editor(): Heed GIT_EDITOR and core.editor settings
581
Teach "git stripspace" the --strip-comments option
582
checkout-index needs a working tree
583
Reinstate the old behaviour when GIT_DIR is set and GIT_WORK_TREE is unset
584
585
Junio C Hamano (24):
586
git-clone: aggressively optimize local clone behaviour.
587
git-completion: add "git stash"
588
INSTALL: add warning on docbook-xsl 1.72 and 1.73
589
unpack-trees.c: assume submodules are clean during check-out
590
Fix install-doc-quick target
591
user-manual: mention git stash
592
setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
593
pager: find out pager setting from configuration
594
Fix "make GZ=1 quick-install-doc"
595
Reorder the list of commands in the manual.
596
Fix formatting of git-blame documentation.
597
Fix an illustration in git-rev-parse.txt
598
tweak manpage formatting
599
Revert "tweak manpage formatting"
600
Optimize "diff --cached" performance.
601
allow git-bundle to create bottomless bundle
602
allow git-bundle to create bottomless bundle
603
t3404: fix "fake-editor"
604
builtin-bundle create - use lock_file
605
git-diff: squelch "empty" diffs
606
merge-recursive: do not rudely die on binary merge
607
attr.c: refactoring
608
attr.c: read .gitattributes from index as well.
609
GIT 1.5.3-rc5
610
611
Jyotirmoy Bhattacharya (1):
612
Fixed git-push manpage
613
614
Linus Torvalds (8):
615
connect: accept file:// URL scheme
616
apply: remove directory that becomes empty by renaming the last file away
617
Start moving unpack-trees to "struct tree_desc"
618
Fix "git commit directory/" performance anomaly
619
Move old index entry removal from "unpack_trees()" into the individual functions
620
Optimize the common cases of git-read-tree
621
Optimize the two-way merge of git-read-tree too
622
Optimize the three-way merge of git-read-tree
623
624
Luiz Fernando N. Capitulino (3):
625
Avoid ambiguous error message if pack.idx header is wrong
626
Introduces xmkstemp()
627
Use xmkstemp() instead of mkstemp()
628
629
Marco Costalba (1):
630
Add --log-size to git log to print message size
631
632
Mark Levedahl (5):
633
builtin-bundle.c - use stream buffered input for rev-list
634
builtin-bundle - use buffered reads for bundle header
635
gitk: Enable selected patch text on Windows
636
gitk: Handle MouseWheel events on Windows
637
t3902 - skip test if file system doesn't support HT in names
638
639
Paul Mackerras (4):
640
gitk: Add a context menu for file list entries
641
gitk: Fix bug causing the "can't unset idinlist(...)" error
642
gitk: Fix bug introduced in commit 67a4f1a7
643
gitk: Fix bug causing Tcl error when updating graph
644
645
Randal L. Schwartz (1):
646
add "test-absolute-path" to .gitignore
647
648
Reece H. Dunn (1):
649
git-p4: Fix the sorting of changelists when cloning a Perforce repository.
650
651
René Scharfe (2):
652
diff: don't run pager if user asked for a diff style exit code
653
diff: squelch empty diffs even more
654
655
Shawn O. Pearce (4):
656
Document GIT_SSH environment variable alongside other variables
657
Teach update-paranoid how to store ACLs organized by groups
658
Teach the update-paranoid to look at file differences
659
Use the empty tree for base diff in paranoid-update on new branches
660
661
Simon Hausmann (2):
662
git-p4: Fix support for symlinks.
663
git-p4: Fix git-p4 submit to include only changed files in the perforce submit template.
664
665
Steffen Prohaska (1):
666
Improved hint on how to set identity
667
668
Steve Hoelzer (2):
669
git-stash documentation: stash numbering starts at zero, not one
670
git-stash documentation: add missing backtick
671
672
Steven Grimm (1):
673
Add a note about the index being updated by git-status in some cases
674
675
Uwe Kleine-König (3):
676
send-email: teach sanitize_address to do rfc2047 quoting
677
send-email: rfc822 forbids using <address@domain> without a non-empty "phrase"
678
send-email: get all the quoting of realnames right
679
680
681
Version v1.5.3-rc4; changes since v1.5.3-rc3:
682
---------------------------------------------
683
684
Alex Riesen (4):
685
Add an option to specify a file to config builtin
686
Add a test for git-config --file
687
Make verse of git-config manpage more readable
688
Hack git-add--interactive to make it work with ActiveState Perl
689
690
Alexandre Julliard (2):
691
git.el: Avoid using ewoc-set-data for compatibility with Emacs 21.
692
git.el: Take into account the core.excludesfile config option.
693
694
Bradford C. Smith (2):
695
fully resolve symlinks when creating lockfiles
696
use lockfile.c routines in git_commit_set_multivar()
697
698
Brian Gernhardt (1):
699
Document commit.template configuration variable.
700
701
Christian Couder (1):
702
rev-list --bisect: fix allocation of "int*" instead of "int".
703
704
Christian Stimming (1):
705
git-gui: Unify wording to say "to stage" instead of "to add"
706
707
David Kastrup (3):
708
Makefile: use $(FIND) instead of find
709
git-sh-setup.sh: make GIT_EDITOR/core.editor/VISUAL/EDITOR accept commands
710
When generating manpages, delete outdated targets first.
711
712
David Soria Parra (1):
713
Documentation/gitattributes.txt: typofix
714
715
David Symonds (1):
716
Fix documentation for core.gitproxy to reflect code
717
718
Han-Wen Nienhuys (2):
719
Sort output of "p4 change" in incremental import before further
720
Fix style nit in Python slicing.
721
722
Jakub Narebski (3):
723
gitweb: Show submodule entries in the 'tree' view
724
gitweb: Simplify 'opt' parameter validation, add "no merges" feeds
725
gitweb: Allow for multivalued parameters passed to href subroutine
726
727
Jeff King (2):
728
Documentation/git-diff: remove -r from --name-status example
729
git-diff: turn on recursion by default
730
731
Jens Axboe (1):
732
--base-path-relaxed option
733
734
Johannes Schindelin (11):
735
rebase -i: fix overzealous output redirection
736
rebase -i: fix interrupted squashing
737
white space fixes in setup.c
738
Add is_absolute_path() and make_absolute_path()
739
Add functions get_relative_cwd() and is_inside_dir()
740
Add set_git_dir() function
741
Clean up work-tree handling
742
get_relative_cwd(): clarify why it handles dir == NULL
743
rebase -i: ignore patches that are already in the upstream
744
rebase -i: fix for optional [branch] parameter
745
read-tree: remove unnecessary call to setup_git_directory()
746
747
Julian Phillips (1):
748
git-gui: Handle git versions of the form n.n.n.GIT
749
750
Junio C Hamano (23):
751
Make sure git-stash works from subdirectory.
752
gitweb: fix broken snapshot
753
git-submodule module_name: avoid using unwieldy "value_regexp" feature.
754
git-submodule: remove redundant call to git-describe
755
When locking in a symlinked repository, try to lock the original.
756
git_mkstemp(): be careful not to overflow the path buffer.
757
Update description of -z option.
758
git-stash: do not remove a ref by hand.
759
Add test for symlinked configuration file updates.
760
Fix git-stash apply --index
761
git-stash apply --index: optimize postprocessing
762
log_ref_write() -- do not chomp reflog message at the first LF
763
symbolic-ref, update-ref: do not refuse reflog message with LF
764
rebase: try not to munge commit log message
765
add_file_to_index: skip rehashing if the cached stat already matches
766
Unset GIT_EDITOR while running tests.
767
git.c: execution path
768
git-commit.sh: Permit the --amend message to be given with -m/-c/-C/-F.
769
RelNotes 1.5.3 updates before -rc4
770
Fix work-tree related breakages
771
gitweb: do not choke on recursive symlink
772
Fix bogus use of printf in t3700 test
773
GIT 1.5.3-rc4
774
775
Kristian Høgsberg (1):
776
Add test case for basic commit functionality.
777
778
Mark Levedahl (1):
779
gitk: Ignore ctrl-z as EOF on windows
780
781
Nanako Shiraishi (1):
782
git-stash: Make sure reflog is created for refs/stash
783
784
Nguyễn Thái Ngọc Duy (1):
785
git-write-tree should not crash if prefix does not exist
786
787
Paul Mackerras (4):
788
gitk: Show changes in index and changes in working directory separately
789
gitk: Make the fake commit for the index changes green rather than magenta
790
gitk: Wait for the window to become visible after creating it
791
gitk: Fix bugs in the Find function
792
793
Robert Ewald (1):
794
git-svn: Translate invalid characters in refname
795
796
Robert Schiele (2):
797
add option to find zlib in custom path
798
make the name of the library directory a config option
799
800
Robin Rosenberg (1):
801
Document --unified/-U option
802
803
Seth Falcon (1):
804
Rename git-rebase interactive buffer: todo => git-rebase-todo
805
806
Shawn O. Pearce (49):
807
git-gui: Skip -dirty suffix on core git versions
808
git-gui: Brown paper bag "dirty git version fix"
809
git-gui: Always disable the Tcl EOF character when reading
810
git-gui: Delay searching for 'nice' until its really asked for
811
git-gui: Don't crash in ask_popup if we haven't mapped main window yet
812
git-gui: Change our initial GC hint to be an estimate
813
git-gui: Let the user continue even if we cannot understand git version
814
git-gui: Delay the GC hint until after we are running
815
git-gui: Move feature option selection before GIT_DIR init
816
git-gui: Allow blame/browser subcommands on bare repositories
817
git-gui: Allow browser subcommand to start in subdirectory
818
git-gui: Allow users to browse any branch, not just the current one
819
git-gui: Clarify the visualize history menu options
820
git-gui: Increase the default height of the revision picker
821
git-gui: Convert merge dialog to use class system
822
Don't offer my special Tools/Migrate hack unless in multicommit
823
git-gui: Bind Ctrl/Cmd-M to merge action
824
git-gui: Avoid unnecessary global statements when possible
825
git-gui: Translate standard encoding names to Tcl ones
826
git-gui: Don't show blame tooltips that we have no data for
827
git-gui: Completely remove support for creating octopus merges
828
git-gui: Automatically backup the user's commit buffer
829
git-gui: Save the merge base during checkout_op processing
830
git-gui: Factor out common fast-forward merge case
831
git-gui: Simplify error case for unsupported merge types
832
git-gui: Skip unnecessary read-tree work during checkout
833
git-gui: Internally allow fetch without storing for future pull support
834
git-gui: Completely remove my Tools/Migrate hack
835
git-gui: Fix unnecessary fast-forward during checkout
836
gitk: Bind keyboard actions to the command key on Mac OS
837
git-gui: Clarify meaning of add tracked menu option
838
git-gui: Paper bag fix quitting crash after commit
839
git-gui: Refactor diff popup into a procedure to ease i18n work
840
git-gui: Refactor current branch menu items to make i18n easier
841
git-gui: Avoid unnecessary symbolic-ref call during checkout
842
git-gui: Save remote urls obtained from config/remotes setup
843
git-gui: Display commit/tag/remote info in tooltip of revision picker
844
git-gui: Show ref last update times in revision chooser tooltips
845
git-gui: Replace merge dialog with our revision picker widget
846
git-gui: Cleanup bindings within merge dialog
847
git-gui: Format tracking branch merges as though they were pulls
848
git-gui: Remove usernames from absolute SSH urls during merging
849
git-gui: Don't kill modified commit message buffer with merge templates
850
git-gui: Honor core.excludesfile when listing extra files
851
git-gui: Use progress bar while resetting/aborting files
852
git-gui: Make sure remotes are loaded when picking revisions
853
git-gui: Don't offer to stage hunks from untracked files
854
git-gui: Use more modern looking icons in the tree browser
855
git-gui: Minor refactoring of merge command line in merge support
856
857
Simon Hausmann (1):
858
git-p4: Fix p4 user cache population on Windows.
859
860
Steve Hoelzer (1):
861
Try to be consistent with capitalization in the documentation
862
863
Thomas Schwinge (2):
864
Don't rely on unspecified behavior
865
Support building on GNU/Hurd
866
867
868
Version v1.5.3-rc3; changes since v1.5.3-rc2:
869
---------------------------------------------
870
871
Adam Roben (1):
872
Add GIT_EDITOR environment and core.editor configuration variables
873
874
Alexandre Julliard (2):
875
git.el: Support for incremental status updates.
876
git.el: Pass an explicit argument to enable smerge-mode.
877
878
Carlos Rica (1):
879
Rename read_pipe() with read_fd() and make its buffer nul-terminated.
880
881
David Kastrup (2):
882
contrib/emacs/Makefile: Also install .el files.
883
Documentation/gitignore.txt: Fix the seriously misleading priority explanation
884
885
Eric Wong (1):
886
git-svn: fix commiting renames over DAV with funky file names
887
888
Francis Moreau (1):
889
Fix git-branch documentation when using remote refs
890
891
Jakub Narebski (3):
892
gitweb cleanup: Move @diff_opts declaration earlier
893
gitweb: Fix support for legacy gitweb config for snapshots
894
gitweb: More detailed error messages for snapshot format
895
896
Jim Meyering (1):
897
pretty-options.txt: tiny doc fix
898
899
Johannes Schindelin (11):
900
filter-branch: get rid of "set -e"
901
rebase -i: call editor just once for a multi-squash
902
fsck --lost-found: write blob's contents, not their SHA-1
903
mailinfo: fix 'fatal: cannot convert from utf-8 to utf-8'
904
Shut "git rebase -i" up when no --verbose was given
905
rebase -i: exchange all "if [ .. ]" by "if test .."
906
filter-branch: Big syntax change; support rewriting multiple refs
907
Teach revision machinery about --no-walk
908
git log -g: Complain, but do not fail, when no reflogs are there
909
Teach approxidate() to understand "never"
910
git am: skip pine's internal folder data
911
912
Julian Phillips (1):
913
Force listingblocks to be monospaced in manpages
914
915
Junio C Hamano (8):
916
Update INSTALL
917
Do not expect unlink(2) to fail on a directory.
918
Fix VISUAL/EDITOR preference order in Documentation/config.txt.
919
Synonyms: -i == --regexp-ignore-case, -E == --extended-regexp
920
Mark user-manual as UTF-8
921
user-manual: fix typolets.
922
t9200: Be careful when checking CVS/Entries
923
GIT 1.5.3-rc3
924
925
Kumar Gala (1):
926
send-email: Update regex parsing for pine aliases
927
928
Linus Torvalds (2):
929
Do a better job at guessing unknown character sets
930
Fix up duplicate parents removal
931
932
Marco Costalba (1):
933
Avoid to duplicate commit message when is not encoded
934
935
Matt McCutchen (1):
936
gitweb: snapshot cleanups & support for offering multiple formats
937
938
Nanako Shiraishi (1):
939
Document "git stash message..."
940
941
René Scharfe (2):
942
filter-branch: fix dash complaining about "Missing '))'"
943
cleanup unpack-trees.c: shrink struct tree_entry_list
944
945
Richard MUSIL (1):
946
git-svn: Minimalistic patch which allows svn usernames with space(s).
947
948
Robin Rosenberg (1):
949
cvsexportcommit: avoid racy CVS problem.
950
951
Scott Lamb (2):
952
git-p4: use subprocess in p4CmdList
953
git-p4: input to "p4 files" by stdin instead of arguments
954
955
Simon Hausmann (3):
956
git-p4: Cleanup, make listExistingP4Branches a global function for later use.
957
git-p4: Fix upstream branch detection for submit/rebase with multiple branches.
958
git-p4: Cleanup, used common function for listing imported p4 branches
959
960
Steven Grimm (2):
961
Document how to tell git to not launch a pager
962
Teach git-commit about commit message templates.
963
964
Sven Verdoolaege (1):
965
unpack-trees.c: assume submodules are clean during check-out
966
967
968
Version v1.5.3-rc2; changes since v1.5.3-rc1:
969
---------------------------------------------
970
971
Alex Riesen (1):
972
Fix git-rebase -i to allow squashing of fast-forwardable commits
973
974
Emil Medve (1):
975
Use $(RM) in Makefiles instead of 'rm -f'
976
977
Eric Wong (1):
978
git-svn: remove leading slashes from fetch lines in the generate config
979
980
Greg KH (1):
981
make git-send-email.perl handle email addresses with no names when Email::Valid is present
982
983
Jakub Narebski (3):
984
Update git-merge documentation.
985
Document long options '--message=<msg>' and '--no-commit'
986
Document git commit --untracked-files and --verbose
987
988
Jim Meyering (1):
989
git-cvsserver: detect/diagnose write failure, etc.
990
991
Josh Triplett (1):
992
Remove useless uses of cat, and replace with filename arguments
993
994
Junio C Hamano (7):
995
Make show_rfc2822_date() just another date output format.
996
Wire new date formats to --date=<format> parser.
997
Document new --date=<format>
998
Add contrib/stats/mailmap.pl script
999
Update .mailmap
1000
Documentation/git-commit-tree: remove description of a nonexistent limitation
1001
GIT v1.5.3-rc2
1002
1003
Marius Storm-Olsen (1):
1004
Fix git-p4 on Windows to not use the Posix sysconf function.
1005
1006
Matthieu Moy (1):
1007
More permissive "git-rm --cached" behavior without -f.
1008
1009
Nicolas Pitre (1):
1010
Pack-objects: properly initialize the depth value
1011
1012
Paul Mackerras (1):
1013
gitk: Fix bug introduced by previous commit
1014
1015
Peter Hagervall (1):
1016
Make every builtin-*.c file #include "builtin.h"
1017
1018
Robin Rosenberg (1):
1019
Support output ISO 8601 format dates
1020
1021
Sean Estabrooks (3):
1022
Remove "WITH_P4IMPORT" knob from the Makefile
1023
Remove p4 rpm from git.spec.in.
1024
Demote git-p4import to contrib status.
1025
1026
Shawn O. Pearce (2):
1027
Correct trivial typo in fast-import documentation
1028
Teach fast-import to recursively copy files/directories
1029
1030
Stephen Rothwell (1):
1031
send-email: discard blank around address in extract_valid_address as well.
1032
1033
Sven Verdoolaege (1):
1034
lockfile.c: schedule remove_lock_file only once.
1035
1036
1037
Version v1.5.3-rc1; changes since v1.5.3-rc0:
1038
---------------------------------------------
1039
1040
Alecs King (1):
1041
fix remote.origin.url in tutorial.txt
1042
1043
Alex Riesen (4):
1044
Handle missing prefix for "Subject:" as if no prefix given
1045
Handle format.subjectprefix for every command which accepts --pretty
1046
Fix t5516 to create test repo without hooks
1047
Add -v|--verbose to git remote to show remote url
1048
1049
Andrew Ruder (2):
1050
Remove USE_PAGER from git-pickaxe and git-annotate
1051
Add urls.txt to git-clone man page
1052
1053
Andy Parkins (1):
1054
user-manual: grammar and style fixes
1055
1056
Brian Downing (10):
1057
pack-objects: Prefer shallower deltas if the size is equal
1058
gitk: Fix for tree view ending in nested directories
1059
Pack information tool
1060
Correct shebang line for contrib/stats/packinfo.pl
1061
Don't try to delta if target is much smaller than source
1062
Support fetching the memory usage of a delta index
1063
Add functions for parsing integers with size suffixes
1064
Add pack-objects window memory usage limit
1065
Add --window-memory option to git-repack
1066
Add documentation for --window-memory, pack.windowMemory
1067
1068
Brian Gernhardt (1):
1069
Add core.pager config variable.
1070
1071
CJ van den Berg (1):
1072
git-submodule: Fix two instances of the same typo
1073
1074
Carlos Rica (5):
1075
t7004: Skip tests for signed tags in an old version of gpg.
1076
t0030: Remove repeated instructions and add missing &&
1077
t0030: Add tests with consecutive text lines and others with spaces added.
1078
t7004: Add tests for the git tag -n option.
1079
Function stripspace now gets a buffer instead file descriptors.
1080
1081
Daniel Barkalow (2):
1082
Add allocation and freeing functions for struct refs
1083
Some cosmetic changes to remote library
1084
1085
David Kastrup (1):
1086
Add missing functions to contrib/emacs/vc-git.el
1087
1088
Eric Wong (1):
1089
git-svn: fix blocking with svn:// servers after do_switch
1090
1091
Frank Lichtenheld (1):
1092
cvsserver: always initialize state in argsplit()
1093
1094
Gerrit Pape (2):
1095
git-gui: properly popup error if gitk should be started but is not installed
1096
git-commit: don't add multiple Signed-off-by: from the same identity
1097
1098
J. Bruce Fields (2):
1099
tutorial: Fix typo
1100
user-manual: more explanation of push and pull usage
1101
1102
James Bowes (1):
1103
stash: allow running from a subdirectory
1104
1105
Jim Meyering (1):
1106
Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
1107
1108
Johannes Schindelin (24):
1109
diff --no-index: fix --name-status with added files
1110
glossary: add 'reflog'
1111
Document git-filter-branch
1112
Add diff-option --ext-diff
1113
filter-branch: add a test for the commit removal example
1114
filter-branch: make output nicer
1115
filter-branch: a few more touch ups to the man page
1116
filter-branch documentation: clarify which filters are eval'ed
1117
filter-branch: fail gracefully when a filter fails
1118
Future-proof source for changes in xdemitconf_t
1119
Teach git-stash to "apply --index"
1120
Enable "git rerere" by the config variable rerere.enabled
1121
git-branch: default to --track
1122
Fix "apply --reverse" with regard to whitespace
1123
branch.autosetupmerge: allow boolean values, or "all"
1124
rebase -i: handle --continue more like non-interactive rebase
1125
rebase -i: actually show the diffstat when being verbose
1126
rebase -i: remember the settings of -v, -s and -p when interrupted
1127
rebase -i: put a nice warning into the todo list
1128
rerere: record resolution even if file is not in merge base
1129
Fix core.sharedRepository = 2
1130
Fix --cherry-pick with given paths
1131
Add for_each_remote() function, and extend remote_find_tracking()
1132
branch --track: code cleanup and saner handling of local branches
1133
1134
Johannes Sixt (3):
1135
filter-branch: Avoid an error message in the map function.
1136
filter-branch documentation: some more touch-ups.
1137
Allow rebase to run if upstream is completely merged
1138
1139
Jonas Fonseca (1):
1140
fsck --lost-found writes to subdirectories in .git/lost-found/
1141
1142
Junio C Hamano (22):
1143
Update draft Release Notes for 1.5.3
1144
Update reflog message created for stashes
1145
Do not check if getcwd() result begins with a slash.
1146
Fix git-stash(1) markup.
1147
git-stash: allow more descriptive reminder message when saving
1148
Introduce diff_filespec_is_binary()
1149
Per-path attribute based hunk header selection.
1150
Fix configuration syntax to specify customized hunk header patterns.
1151
diff: honor binariness specified in attributes
1152
gitweb: make repeated calls to git_get_project_owner() bearable
1153
diff.c: make built-in hunk header pattern a separate table
1154
git-gui: use "blame -w -C -C" for "where did it come from, originally?"
1155
git-stash: try reusing cached stat info as much as possible
1156
Fix merge-one-file for our-side-added/our-side-removed cases
1157
Document custom hunk header selection
1158
revision.c: remove duplicated parents after history simplification
1159
Revert 88494423 (removal of duplicate parents in the output codepath)
1160
Re-code builtin-branch.c in UTF-8
1161
Teach read-tree 2-way merge to ignore intermediate symlinks
1162
GIT 1.5.2.4
1163
Update list of older git docs
1164
GIT v1.5.3-rc1
1165
1166
Lars Hjemli (1):
1167
git-submodule(1): update description and key names
1168
1169
Marcus Fritzsch (1):
1170
Fixed a formulation mistake in Documentation/user-manual.txt
1171
1172
Matt Kraai (3):
1173
Prefer EMAIL to username@hostname.
1174
Change "added.moved or removed" to "added, moved or removed" in
1175
Add [verse] to the SYNOPSIS section of git-submodule.txt.
1176
1177
Matt McCutchen (3):
1178
gitweb: make search form generate pathinfo-style URLs
1179
gitweb: make "No commits" in project list gray, not bold green
1180
Makefile: rebuild git.o on version change, clean up git$X flags
1181
1182
Matthias Lederhofer (3):
1183
git-init: set core.worktree if GIT_WORK_TREE is specified
1184
git-clone: split up long &&-command-chain and use a function for cleanup
1185
make git-clone GIT_WORK_TREE aware
1186
1187
Michael Hendricks (2):
1188
git-send-email: allow an email alias for --from
1189
gitweb: configurable width for the projects list Description column
1190
1191
Miklos Vajna (3):
1192
Document -<n> for git-format-patch
1193
gitweb: prefer git_get_project_owner() over get_file_owner()
1194
gitweb: new cgi parameter: opt
1195
1196
Nicolas Pitre (3):
1197
apply delta depth bias to already deltified objects
1198
script to display a distribution of longest common hash prefixes
1199
reduce git-pack-objects memory usage a little more
1200
1201
Paul Mackerras (6):
1202
gitk: Fix the find and highlight functions
1203
gitk: Fix bug in the anc_or_desc routine
1204
gitk: Remove the unused stopfindproc function
1205
gitk: Fix bug causing "can't read commitrow(0,n)" error
1206
gitk: Use git log and add support for --left-right
1207
gitk: Improve handling of -- and ambiguous arguments
1208
1209
René Scharfe (1):
1210
diff-lib.c: don't strdup twice
1211
1212
Sean Estabrooks (1):
1213
Alter git-checkout reflog message to include "from" branch
1214
1215
Shawn O. Pearce (46):
1216
git-gui: Unlock the index when cancelling merge dialog
1217
git-gui: Start blame windows as tall as possible
1218
git-gui: Correct resizing of remote branch delete dialog
1219
git-gui: Don't bind F5/M1-R in all windows
1220
git-gui: Bind M1-P to push action
1221
git-gui: Include a Push action on the left toolbar
1222
git-gui: Ensure windows shortcuts always have .bat extension
1223
git-gui: Honor rerere.enabled configuration option
1224
git-gui: New Git version check support routine
1225
git-gui: Skip nicknames when selecting author initials
1226
git-gui: Teach class system to support [$this cmd] syntax
1227
git-gui: Abstract the revision picker into a mega widget
1228
git-gui: Refactor the delete branch dialog to use class system
1229
git-gui: Optimize for newstyle refs/remotes layout
1230
git-gui: Maintain remote and source ref for tracking branches
1231
git-gui: Allow users to match remote branch names locally
1232
git-gui: Fast-forward existing branch in branch create dialog
1233
git-gui: Enhance choose_rev to handle hundreds of branches
1234
git-gui: Sort tags descending by tagger date
1235
git-gui: Option to default new branches to match tracking branches
1236
git-gui: Automatically refresh tracking branches when needed
1237
git-gui: Better handling of detached HEAD
1238
git-gui: Refactor our ui_status_value update technique
1239
git-gui: Refactor branch switch to support detached head
1240
git-gui: Unabbreviate commit SHA-1s prior to display
1241
git-gui: Default selection to first matching ref
1242
git-gui: Allow double-click in checkout dialog to start checkout
1243
git-gui: Extract blame viewer status bar into mega-widget
1244
git-gui: Change the main window progress bar to use status_bar
1245
git-gui: Show a progress meter for checking out files
1246
git-gui: Always use absolute path to all git executables
1247
git-gui: Correct gitk installation location
1248
git-gui: Assume unfound commands are known by git wrapper
1249
git-gui: Treat `git version` as `git --version`
1250
git-gui: Perform our own magic shbang detection on Windows
1251
git-gui: Teach console widget to use git_read
1252
git-gui: Improve the Windows and Mac OS X shortcut creators
1253
git-gui: Correct ls-tree buffering problem in browser
1254
git-gui: Don't linewrap within console windows
1255
git-gui: Paper bag fix for Cygwin shortcut creation
1256
git-gui: Use sh.exe in Cygwin shortcuts
1257
git-gui: Include a space in Cygwin shortcut command lines
1258
Clarify documentation of fast-import's D subcommand
1259
Support wholesale directory renames in fast-import
1260
git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
1261
git-gui: Change prior tree SHA-1 verification to use git_read
1262
1263
Steffen Prohaska (1):
1264
filter-branch: added missing warn function
1265
1266
Steven Walter (1):
1267
Documentation for git-log --follow
1268
1269
Uwe Kleine-König (2):
1270
stash: end commit log with a newline
1271
repack: don't report "Nothing new to pack." if -q is given
1272
1273
William Pursell (1):
1274
user-manual: fix directory name in git-archive example
1275
1276
1277
Version v1.5.3-rc0; changes since v1.5.2.5:
1278
-------------------------------------------
1279
1280
Adam Roben (3):
1281
git-send-email: Add --threaded option
1282
git-send-email: make options easier to configure.
1283
format-patch: Add format.subjectprefix config option
1284
1285
Alex Riesen (11):
1286
Fix the progress code to output LF only when it is really needed
1287
Add run_command_v_opt_cd: chdir into a directory before exec
1288
Add ability to specify environment extension to run_command
1289
Allow environment variables to be unset in the processes started by run_command
1290
Verbose connect messages to show the IP addresses used
1291
Add another verbosity level to git-fetch
1292
Add a configuration option to control diffstat after merge
1293
Fix push with refspecs containing wildcards
1294
Do not use h_errno after connect(2): the function does not set it
1295
cvsserver: Actually implement --export-all
1296
Avoid perl in t1300-repo-config
1297
1298
Alexandre Julliard (1):
1299
pack-check: Sort entries by pack offset before unpacking them.
1300
1301
Alexandre Vassalotti (1):
1302
git-tag: Fix "can't shift that many".
1303
1304
Andy Whitcroft (3):
1305
cvsimport: add support for new style remote layout
1306
cvsimport: update documentation to include separate remotes option
1307
cvsimport: add <remote>/HEAD reference in separate remotes more
1308
1309
Aneesh Kumar K.V (2):
1310
gitview: Fix the blame interface.
1311
gitview: run blame with -C -C
1312
1313
Benjamin Sergeant (1):
1314
git-p4 fails when cloning a p4 depo.
1315
1316
Brian Gernhardt (1):
1317
Fix t5516-fetch for systems where `wc -l` outputs whitespace.
1318
1319
Carlos Rica (3):
1320
Fix git-stripspace to process correctly long lines and spaces.
1321
Add test script for git-stripspace.
1322
Add test-script for git-tag
1323
1324
Dan McGee (1):
1325
git-mergetool: Allow gvimdiff to be used as a mergetool
1326
1327
Dana L. How (8):
1328
Custom compression levels for objects and packs
1329
Alter sha1close() 3rd argument to request flush only
1330
git-repack --max-pack-size: new file statics and code restructuring
1331
git-repack --max-pack-size: write_{object,one}() respect pack limit
1332
git-repack --max-pack-size: split packs as asked by write_{object,one}()
1333
git-repack --max-pack-size: add option parsing to enable feature
1334
pack-objects: clarification & option checks for --max-pack-size
1335
Ensure git-repack -a -d --max-pack-size=N deletes correct packs
1336
1337
Daniel Barkalow (6):
1338
Move remote parsing into a library file out of builtin-push.
1339
Move refspec parser from connect.c and cache.h to remote.{c,h}
1340
Add handlers for fetch-side configuration of remotes.
1341
Update local tracking refs when pushing
1342
Move refspec pattern matching to match_refs().
1343
Fix pushing to a pattern with no dst
1344
1345
Dave O'Neill (1):
1346
Generate tags with correct timestamp (git-svnimport)
1347
1348
Elvis Pranskevichus (1):
1349
Use git-tag in git-cvsimport
1350
1351
Emil Medve (1):
1352
git-submodule: Instead of using only annotated tags, use any tags.
1353
1354
Eric Wong (4):
1355
git-svn: cleanup: factor out longest_common_path() function
1356
git-svn: test for creating new directories over svn://
1357
git-svn: reduce stat() calls for a backwards compatibility check
1358
git-svn: allow dcommit to retain local merge information
1359
1360
Fernando J. Pereda (1):
1361
Teach mailsplit about Maildir's
1362
1363
Frank Lichtenheld (11):
1364
t9400: Add test cases for config file handling
1365
t9400: Add some more cvs update tests
1366
t9400: Add some basic pserver tests
1367
t9400: Work around CVS' deficiencies
1368
cvsserver: Handle 'cvs login'
1369
cvsserver: Make req_Root more critical of its input data
1370
cvsserver: Add some useful commandline options
1371
cvsserver: Let --base-path and pserver get along just fine
1372
cvsserver: Actually implement --export-all
1373
config: Add --null/-z option for null-delimted output
1374
config: add support for --bool and --int while setting values
1375
1376
Geert Bosch (1):
1377
Unify write_index_file functions
1378
1379
Gerrit Pape (3):
1380
git-branch: cleanup config file when deleting branches
1381
git-svn: trailing slash in prefix is mandatory with --branches/-b
1382
git-cvsimport: force checkout of working tree after initial import
1383
1384
Han-Wen Nienhuys (28):
1385
Cleanups
1386
reformatting: break long lines.
1387
rename apply() to applyCommit(); apply is a python builtin
1388
add .dotest to .gitignore
1389
Robustness fixes for pipes
1390
cleanup
1391
minor cleanups
1392
clone and sync --keep-path to keep perforce path to module.
1393
use string.strip() iso. slicing.
1394
use strip() iso. slicing for removing \n
1395
add --verbose to all commands.
1396
Extract multiple paths concurrently.
1397
Diverse cleanups
1398
remove global .gitdir
1399
Read p4 files in one batch.
1400
Thinko, fix buglet.
1401
store p4 user cache in home directory.
1402
thinko.
1403
read files before creating the commit.
1404
don't p4 print deleted files.
1405
only run p4 print if necessary
1406
use p4CmdList() to get file contents in Python dicts. This is more robust.
1407
Cleanups & import into p4/master for local import
1408
remove debug print
1409
thinko: really ignore deleted files.
1410
look for 'text' and 'binary' files.
1411
print error message when p4 print fails (eg. due to permission problems)
1412
also strip p4/ from local imports.
1413
1414
Ismail Dönmez (1):
1415
Change default man page path to /usr/share/man
1416
1417
Jakub Narebski (16):
1418
gitweb: Add test t9500 for gitweb (as standalone script)
1419
Add an option to git-ls-tree to display also the size of blob
1420
gitweb: Provide links to commitdiff to each parent in 'commitdiff' view
1421
gitweb: Improve "next" link in commitdiff view
1422
gitweb: Split git_patchset_body into separate subroutines
1423
gitweb: Create special from-file/to-file header for combined diff
1424
gitweb: Add links to blobdiffs in from-file/to-file header for merges
1425
gitweb: '--cc' for merges in 'commitdiff' view
1426
Document git rev-list --full-history
1427
Document git read-tree --trivial
1428
Document git rev-parse --is-inside-git-dir
1429
Document git reflog --stale-fix
1430
Document git rev-list --timestamp
1431
Use tabs for indenting definition list for options in git-log.txt
1432
Document git log --abbrev-commit, as a kind of pretty option
1433
Document git log --full-diff
1434
1435
James Bowes (2):
1436
Add colour support in rebase and merge tree diff stats output.
1437
rev-parse: Identify short sha1 sums correctly.
1438
1439
Jeff King (12):
1440
cmd_log_init: remove parsing of --encoding command line parameter
1441
refactor dir_add_name
1442
dir_struct: add collect_ignored option
1443
builtin-add: simplify (and increase accuracy of) exclude handling
1444
Fix ALLOC_GROW off-by-one
1445
Fix ALLOC_GROW calls with obsolete semantics
1446
git-stash: fix "no arguments" case in documentation
1447
git-stash: fix "can't shift that many" with no arguments
1448
git-stash: don't complain when listing in a repo with no stash
1449
Documentation: quote {non-attributes} for asciidoc
1450
Documentation: quote {non-attributes} for asciidoc
1451
Documentation: minor cleanups to branch/checkout wording
1452
1453
Jeffrey C. Ollie (2):
1454
Add an option to quiet git-init.
1455
Quiet the output from git-init when cloning, if requested.
1456
1457
Jim Meyering (4):
1458
Don't dereference a strdup-returned NULL
1459
detect close failure on just-written file handles
1460
Don't ignore a pack-refs write failure
1461
git-log: detect dup and fdopen failure
1462
1463
Johan Herland (1):
1464
Remove unnecessary code and comments on non-existing 8kB tag object restriction
1465
1466
Johannes Schindelin (23):
1467
Update to SubmittingPatches
1468
Add git-filter-branch
1469
git-fsck: learn about --verbose
1470
Move buffer_is_binary() to xdiff-interface.h
1471
merge-recursive: refuse to merge binary files
1472
git-merge-file: refuse to merge binary files
1473
filter-branch: use $(($i+1)) instead of $((i+1))
1474
filter-branch: fix behaviour of '-k'
1475
t5000: skip ZIP tests if unzip was not found
1476
Teach filter-branch about subdirectory filtering
1477
Teach diff to imply --find-copies-harder upon -C -C
1478
pp_header(): work around possible memory corruption
1479
diffcore-rename: favour identical basenames
1480
filter-branch: add example to move everything into a subdirectory
1481
Move the pick_author code to git-sh-setup
1482
Teach rebase an interactive mode
1483
rebase -i: several cleanups
1484
rebase -i: provide reasonable reflog for the rebased branch
1485
Teach rebase -i about --preserve-merges
1486
t7004: ship trustdb to avoid gpg warnings
1487
git add: respect core.filemode with unmerged entries
1488
Make '!' aliases more useful
1489
git-fsck: add --lost-found option
1490
1491
Johannes Sixt (9):
1492
filter-branch: Use rev-list arguments to specify revision ranges.
1493
filter-branch: also don't fail in map() if a commit cannot be mapped
1494
Makefile: Remove git-merge-base from PROGRAMS.
1495
filter-branch: Simplify parent computation.
1496
filter-branch: subdirectory filter needs --full-history
1497
Avoid double-slash in path names that depend on $(sharedir).
1498
Remove trailing slash from $(template_dir).
1499
git-remote show: Also shorten non-fast-forward refs in the 'push' listing
1500
Test 'git add' for unmerged entries when core.symlinks=false.
1501
1502
Jon Loeliger (1):
1503
Add the --numbered-files option to git-format-patch.
1504
1505
Jonas Fonseca (2):
1506
Fix git-am(1) synopsis formatting
1507
git-rebase: suggest to use git-add instead of git-update-index
1508
1509
Josh Triplett (1):
1510
Fix typo in git-mergetool
1511
1512
Julian Phillips (2):
1513
Makefile: Use generic rule to build test programs
1514
new-workdir: handle rev-parse --git-dir not always giving full path
1515
1516
Junio C Hamano (48):
1517
git-apply: Fix removal of new trailing blank lines.
1518
pack-objects: pass fullname down to add_object_entry()
1519
Teach "delta" attribute to pack-objects.
1520
builtin-pack-objects: remove unnecessary code for no-delta
1521
Fix command line parameter parser of revert/cherry-pick
1522
Remove git-applypatch
1523
mailsplit: fix for more than one input files
1524
Add DLH to .mailmap
1525
Release Notes: start preparing for 1.5.3
1526
git-apply: what is detected and fixed is not just trailing spaces.
1527
t7003: make test repeatable
1528
git-branch --track: fix tracking branch computation.
1529
War on whitespace
1530
Test wildcard push/fetch
1531
More missing static
1532
More missing static
1533
Even more missing static
1534
remote.c: refactor match_explicit_refs()
1535
remote.c: refactor creation of new dst ref
1536
remote.c: minor clean-up of match_explicit()
1537
remote.c: fix "git push" weak match disambiguation
1538
remote.c: "git-push frotz" should update what matches at the source.
1539
git-push: Update description of refspecs and add examples
1540
git-blame: do not indent with spaces.
1541
git-blame -w: ignore whitespace
1542
mktag: minimally update the description.
1543
Lift 16kB limit of log message output
1544
Extend --pretty=oneline to cover the first paragraph,
1545
Makefile: common-cmds.h depends on generate-cmdlist.sh script
1546
Makefile: allow generating git.o for debugging purposes
1547
-Wold-style-definition fix
1548
More static
1549
Documentation: update "stale" links for 1.5.2.2
1550
INSTALL: explain how to build documentation
1551
Two trivial -Wcast-qual fixes
1552
git-send-email: Do not make @-less message ID
1553
Add core.quotepath configuration variable.
1554
Update draft Release Notes for 1.5.3
1555
diffcore_count_changes: pass diffcore_filespec
1556
diffcore_filespec: add is_binary
1557
diffcore-delta.c: update the comment on the algorithm.
1558
diffcore-delta.c: Ignore CR in CRLF for text files
1559
git-stash: require "save" to be explicit and update documentation
1560
Update public documentation links for 1.5.2.3
1561
"git-push $URL" without refspecs pushes only matching branches
1562
Rewrite "git-frotz" to "git frotz"
1563
git-stash: make "save" the default action again.
1564
Mark disused commit walkers officially deprecated.
1565
1566
Kevin Green (1):
1567
git-p4: check for existence of repo dir before trying to create
1568
1569
Lars Hjemli (10):
1570
Add git-submodule command
1571
Add basic test-script for git-submodule
1572
git-submodule: move cloning into a separate function
1573
git-submodule: clone during update, not during init
1574
t7400: barf if git-submodule removes or replaces a file
1575
git-submodule: remember to checkout after clone
1576
Rename sections from "module" to "submodule" in .gitmodules
1577
git-submodule: give submodules proper names
1578
Add gitmodules(5)
1579
gitmodules(5): remove leading period from synopsis
1580
1581
Linus Torvalds (9):
1582
Make "git gc" pack all refs by default
1583
Make the pack-refs interfaces usable from outside
1584
Makefile: add an explicit rule for building assembly output
1585
Finally implement "git log --follow"
1586
Fix up "git log --follow" a bit..
1587
Clean up internal command handling
1588
Check for IO errors after running a command
1589
git: Try a bit harder not to lose errno in stdio
1590
Start deprecating "git-command" in favor of "git command"
1591
1592
Marco Costalba (1):
1593
Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file
1594
1595
Marius Storm-Olsen (7):
1596
Make the command call silent
1597
Replace \r\n with \n when importing from p4 on Windows
1598
Ensure that the commit message is Windows formated (CRLF) before invoking the editor.
1599
Fix git-p4 clone (defaultDestination)
1600
Fix single branch import into remotes
1601
Exclude the HEAD symbolic ref from the list of known branches
1602
Only use double quotes on Windows
1603
1604
Mark Levedahl (6):
1605
gitk: Make selection highlight color configurable
1606
gitk: Update fontsize in patch / tree list
1607
gitk: Allow specifying tabstop as other than default 8 characters.
1608
gitweb.perl - Optionally send archives as .zip files
1609
gitk: Use a spinbox for setting tabstop settings
1610
gitk: Update selection background colorbar in prefs dialog
1611
1612
Martin Koegler (5):
1613
builtin-pack-objects: don't fail, if delta is not possible
1614
git-pack-objects: cache small deltas between big objects
1615
builtin-pack-object: cache small deltas
1616
diff-delta: use realloc instead of xrealloc
1617
gitweb: Handle non UTF-8 text better
1618
1619
Martin Waitz (1):
1620
rename dirlink to gitlink.
1621
1622
Matthias Lederhofer (18):
1623
add git-filter-branch to .gitignore
1624
make clean should remove all the test programs too
1625
filter-branch: prevent filters from reading from stdin
1626
chmod +x git-filter-branch.sh
1627
rev-parse: document --is-inside-git-dir
1628
rev-parse: introduce --is-bare-repository
1629
test git rev-parse
1630
introduce GIT_WORK_TREE to specify the work tree
1631
Use new semantics of is_bare/inside_git_dir/inside_work_tree
1632
extend rev-parse test for --is-inside-work-tree
1633
test GIT_WORK_TREE
1634
setup_git_directory: fix segfault if repository is found in cwd
1635
filter-branch: always export GIT_DIR if it is set
1636
gitweb: change filename/directory name of snapshots
1637
make git barf when an alias changes environment variables
1638
make dist: include configure script in tarball
1639
ignore git-rebase--interactive
1640
getenv/setenv: use constants if available
1641
1642
Matthijs Melchior (1):
1643
Teach git-tag about showing tag annotations.
1644
1645
Michael Ellerman (2):
1646
gitview: Use new-style classes
1647
gitview: Define __slots__ for Commit
1648
1649
Michael Krelin (1):
1650
git-svn: honor ~/.subversion/ client cert file settings.
1651
1652
Michael S. Tsirkin (1):
1653
connect: display connection progress
1654
1655
Nanako Shiraishi (3):
1656
Cloning from a repo without "current branch"
1657
Add git-stash script
1658
Document git-stash
1659
1660
Nicolas Pitre (8):
1661
allow for undeltified objects not to be reused
1662
make "repack -f" imply "pack-objects --no-reuse-object"
1663
deprecate the new loose object header format
1664
fixes to output of git-verify-pack -v
1665
improve delta long block matching with big files
1666
update diff-delta.c copyright
1667
fix repack with --max-pack-size
1668
always start looking up objects in the last used pack first
1669
1670
Paul Mackerras (18):
1671
gitk: Use the -q flag to git checkout
1672
gitk: New infrastructure for working out branches & previous/next tags
1673
gitk: Don't try to list large numbers of tags or heads in the details pane
1674
gitk: Add some more comments to the optimize_rows procedure
1675
gitk: Improve the behaviour of the initial selection
1676
gitk: Implement a simple scheduler for the compute-intensive stuff
1677
gitk: Cope with commit messages with carriage-returns and initial blank lines
1678
gitk: Disable the head context menu entries for the checked-out branch
1679
gitk: Store ids in rowrangelist and idrowranges rather than row numbers
1680
gitk: New algorithm for drawing the graph lines
1681
gitk: Show local uncommitted changes as a fake commit
1682
gitk: Speed up the reading of references
1683
gitk: Get rid of the childlist variable
1684
gitk: Add a "reset branch to here" row context-menu operation
1685
gitk: Limit how often we change the canvas scrolling region
1686
gitk: Fix bug causing nearby tags/heads to sometimes not be displayed
1687
gitk: Improve handling of whitespace and special chars in filenames
1688
gitk: Add a progress bar to show progress while resetting
1689
1690
Petr Baudis (2):
1691
git-rev-list: Add regexp tuning options
1692
git-applymbox: Remove command
1693
1694
Pierre Habouzit (3):
1695
$EMAIL is a last resort fallback, as it's system-wide.
1696
Active_nr is unsigned, hence can't be < 0
1697
Missing statics.
1698
1699
Quy Tonthat (1):
1700
git.spec: RPM failed, looking for wrong files.
1701
1702
Randal L. Schwartz (1):
1703
Add test-sha1 to .gitignore.
1704
1705
René Scharfe (3):
1706
t5000: silence unzip availability check
1707
diffcore-rename: don't change similarity index based on basename equality
1708
diff: round down similarity index
1709
1710
Robin Rosenberg (1):
1711
Add option to cvs update before export
1712
1713
Sam Vilain (3):
1714
git-svn: avoid string eval for defining functions
1715
git-svn: use git-log rather than rev-list | xargs cat-file
1716
git-svn: cache max revision in rev_db databases
1717
1718
Shawn O. Pearce (24):
1719
Teach git-describe how to run name-rev
1720
Lazily open pack index files on demand
1721
Micro-optimize prepare_alt_odb
1722
Attempt to delay prepare_alt_odb during get_sha1
1723
git gui 0.8.0
1724
git-gui: GUI support for running 'git remote prune <name>'
1725
git-gui: Show the git-gui library path in 'About git-gui'
1726
git-gui: Enable verbose Tcl loading earlier
1727
git-gui: Provide fatal error if library is unavailable
1728
git-gui: Disable tearoff menus on Windows, Mac OS X
1729
git-gui: Allow users to rename branches through 'branch -m'
1730
git-gui: Allow users to delete remote branches
1731
git-gui: Expose the merge.diffstat configuration option
1732
Allow contrib new-workdir to link into bare repositories
1733
Test for recent rev-parse $abbrev_sha1 regression
1734
Simplify index access condition in count-objects, pack-redundant
1735
Ensure the pack index is opened before access
1736
Style nit - don't put space after function names
1737
git-gui: Internalize symbolic-ref HEAD reading logic
1738
git-gui: Quiet our installation process
1739
Avoid src:dst syntax as default bash completion for git push
1740
Document git-gui, git-citool as mainporcelain manual pages
1741
Teach bash how to complete +refspec on git-push
1742
Correct usages of sed in git-tag for Mac OS X
1743
1744
Simon Hausmann (223):
1745
Initial import of a python script to import changesets from Perforce into git.
1746
Added basic support for specifying the depot path to import from as well as the range of perforce changes.
1747
Slightly improved help usage output and made specifying the trailing slash for the depot path optional.
1748
Implemented basic support for converting the date of the perforce change to the git format. The timezone isn't correctly set up yet though.
1749
Some fixes to the timezone conversion between the date of a perforce change and the git commit.
1750
Speed up the import of individual files from Perforce into git by passing the output of "p4 print" directly to git fast-import. Also try to set the mode of the file in git correctly based on file type heuristics.
1751
Removed unused p4cat function and added helper function for the perforce python interface (p4Cmd).
1752
Changed the import mechanism to write to git fast-import through a pipe instead of having p4-fast-export write to stdout and let the caller connect it to git fast-import.
1753
Minor code cleanups and ported some p4 interfacing code over to the p4 python mode.
1754
Instead of parsing the output of "p4 users" use the python objects of "p4 -G users".
1755
Ported the remaining functions that parsed p4 shell output over to the p4 python interface.
1756
Avoid calling fstat for every imported file (slow!) and instead read the file data first into the python process and use the length of the bytes read for the size field of git fast-import.
1757
Permit calling p4-fast-export with a depot path that has the typical ... wildcard at the end.
1758
Fixed displaying import progress by calling flush on stdout.
1759
Create a git tag for every changeset imported from perforce.
1760
Fix file permissions of p4-fast-export.py to be executable.
1761
Started working on incremental imports from Perforce.
1762
Simplify the incremental import by elimination the need for a temporary import branch.
1763
Code cleanups, move the code to create a commit with fast-import into a separate function out of the main loop.
1764
Initial support for importing a directory from Perforce at a specified revision.
1765
Minor cleanups and print an error message of git fast-import if it fails.
1766
Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import.
1767
Make incremental imports easier to use by storing the p4 depot path after an import in .git/config and re-using it when we're invoked again later.
1768
Make specifying the revision ranges more convenient.
1769
Fix calculation of the newest imported revision for #head imports.
1770
Catch io exceptions from git fast-import again and print the error message.
1771
Made the name of the git branch used for the perforce import configurable through a new --branch=<name> commandline option.
1772
Added a little helper script to debug the output of the p4 python interface.
1773
Minor code cleanups.
1774
Avoid the excessive use of git tags for every perforce change and instead just create one git tag for the last imported change.
1775
Changed the default git import branch from "p4" to "master".
1776
Added a little helper script to remove unused tags from the perforce import.
1777
Create lightweight git tags (using the "reset" trick) for the incremental import instead of full-blown ones. Also fix parsing the output of git name-rev for figuring out the last imported p4 change number.
1778
Cleanups, remove unused variable.
1779
Code cleanups.
1780
Started work on p4 branch detection (experimental!).
1781
More fixes in heuristic p4 branch detection based on common path components.
1782
After marking a p4 branch as merged don't ever merge it in git again.
1783
Set git fast-import marks for every imported change for future use.
1784
When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent.
1785
Make it possible to specify the p4 changes to import through a text file (for debugging) and made various improvements to the branch/merge heuristic detection.
1786
Use sets.Set() instead of set() to run also with older versions of Python.
1787
Fix single-branch imports by skipping the branch/merge detection correctly.
1788
Added p4 delete behavioural emulation as todo item.
1789
Added support for --silent so that p4-fast-export can be called from cronjobs.
1790
More work in --silent support.
1791
Don't print a plain newline at the end of the execution (avoids bogus cron error mails).
1792
Adjust the output parsing of git name-rev to handle the output of the latest git version.
1793
Work in progress on detecting branches.
1794
Changed --known-branches to take a file as argument instead of a comma separated list.
1795
Fixed p4-debug file extension.
1796
Make the p4 data/command cache configurable through the --cache-debug commandline option.
1797
Minor code cleanups.
1798
More code cleanups and preparations for more branch detection heuristics.
1799
More work on branch detection by implementing changeIsBranchMerge().
1800
Reduce the number of false "merges" by skipping "branch from" entries in the integrated output as well as by ignoring integrations of future (newer) changes.
1801
Split up the cache commandline options into (command) cache and data cache.
1802
First version of a new script to submit changes back to perforce from git repositories.
1803
Fix git-dir option and allow reading log substitutions from a file
1804
Lots of bugfixes to p4-git-sync.
1805
Automatically operate on a temporary branch, needed for cherry-pick to work when applying changes to
1806
Be nice and use /usr/bin/env python for the git-p4 scripts
1807
Ignore Apple resource files when importing from perforce to git.
1808
Auto-detect the current git branch before submitting back to perforce.
1809
Use p4 revert ... instead of revert -a ... after submitting, to make sure the p4 checkout is clean.
1810
Default to interactive syncing
1811
Improved the git dir detection.
1812
Pass the right number of arguments to commit, fixes single-branch imports.
1813
Start moving the git-p4 tools into one single script.
1814
Provide a little bit of help description for the git-p4 "tools".
1815
First (untested) attempt at migrating p4-git-sync into the final git-p4 script
1816
Part of the code is copyright by Trolltech ASA.
1817
sync-to-perforce is now called submit and fixed the gitdir check a little bit
1818
Completely untested "merge" of p4-fast-export.py into git-p4.py
1819
Added missing "self"s to make the script evaluate correctly.
1820
Fixed the initial version import by getting the file index correct by correctly skipping deleted files.
1821
Removed p4-fast-export and p4-git-sync as they've been integrated into git-p4 now.
1822
Start of the git-p4 documentation.
1823
Documentation enhancements.
1824
Added experimental but super-fast --apply-as-patch option to git-p4 submit
1825
Fix support for deletions in git-p4 submit when using --apply-as-patch by filtering out deletions in the diff-tree output.
1826
Made --apply-as-patch the default for git-p4 submit as it's significantly faster.
1827
Make it possible to invoke git-p4 from within subdirectories of a git working tree.
1828
Don't show the submit template and the diff first in less but show it in $editor right away
1829
Removed the .py extension from git-p4 as it's annoying to type every time.
1830
Changed the format of the imported log message slightly, so that it's easier to parse again.
1831
Changed the default branch for imports from "master" to "p4"
1832
Added some helper function(s) to parse the depot path and change number from the log message
1833
Helper function to check the existance of a revision
1834
Set the default branch in run, not in the constructor
1835
Brand new smart incremental import that doesn't need tags or git repo-config :)
1836
Make it possible to run git-p4 submit from within the git repository
1837
Use the new incremental import style by default
1838
Different versions of p4 have different output for the where command ;(
1839
Minor cosmetic fixlet for the git-p4 submit sync question.
1840
Prefer git command over git-command.
1841
Don't try to parse any options with git-p4 debug but pass it straight on to p4
1842
git-p4 debug doesn't need a git repository
1843
Added support for mapping p4 labels to git tags
1844
Fix variable usage in tag import
1845
Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into
1846
Fix "compilation" :)
1847
Clean up python class names.
1848
Added git-p4 rebase convenience
1849
Provide a tree summary after git-p4 rebase
1850
Turn off potentially slow label detection by default
1851
Honor --silent for labels
1852
Added git-p4 clone convenience command
1853
Fix file determination for #head imports
1854
fix variable usage (oops)
1855
Added a simple example of usage to the "documentation" :)
1856
Allow for convenient rebasing after git-p4 submit
1857
Print an error message of some sort if git fast-import fails.
1858
Fix the timezone formatting. Now qgit also displays (parses) it correctly.
1859
Removed the old patch apply code from git-p4 submit.
1860
Slightly improved formatting of the raw_input questions.
1861
A new attempt at fixing the child-fast-import-process-not-finished race condition
1862
Handle patch errors in git-p4 submit better.
1863
Doc cleanups.
1864
Micro cleanup
1865
cleanup, renamed self.globalPrefix to self.depotPath
1866
Cleanup, removed the old tagging code
1867
Document some implementation details, for the curious... :)
1868
Use the subprocess module instead of popen2 to make it work on Windows.
1869
Added a little .bat wrapper from Marius
1870
Make sure all popen calls use binary mode (for Windows) and
1871
Make submitting work on Windows.
1872
Converted to unix newlines
1873
Fix git-p4 clone //depot/project (head import)
1874
Make git-p4 work with bare repositories.
1875
Added the possibility of skipping patches during git-p4 submit
1876
Give a better hint if git-p4 submit fails
1877
Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)
1878
A little todo note before I forget it :), based on a suggestion from Lars.
1879
Fixing syncing (gitdir discovery / cd) for bare repositories
1880
Always pass a sha1 for the initial parent so that git-fast-import doesn't think
1881
Clean up code duplication for revision parsing and fix previous commit to not
1882
Removed cleantags command. It doesn't have any meaning anymore.
1883
Removed ancient and unused code to find the last imported revision from previous imports
1884
Create the origin based import branch using git update-ref instead of git branch
1885
Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master}
1886
Bite the bullet and automatically convert old style refs/heads/p4 repositories
1887
Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :)
1888
Removed todo item that is implemented :)
1889
Fix branch setup after initial clone.
1890
Removed unused cache variables.
1891
Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo".
1892
Give branches a nice project prefix and don't bail out on clone if we failed
1893
More work on the incremental importing of multiple branches.
1894
Cleanup/speed up the branch<> file split and removed change range limitation that I added
1895
More cleanups and speedups for labels and branches
1896
Removed unused variable, more cleanups
1897
Cache the output of "p4 users" for faster syncs on high latency links.
1898
Fix gitdir not being set when cloning. Needed for writing the p4 users cache.
1899
Oops, not only /set/ gitdir on clone, also set it /correctly/ :)
1900
Use git format-patch and git apply --apply when extracting patches from git and
1901
Added support for git-p4 submit --direct (experimental)
1902
Specifying --detect-branches is now only needed for the initial clone/sync.
1903
Had an idea for debugging, record it :)
1904
Another (potentially life-saving) idea for submit --direct
1905
Improved output for multi branch imports and noted another little todo item
1906
Fix conversion from old style heads/p4 to remotes/p4/master
1907
Fix error detection with git-p4 submit when the requested depot path is not in the client view.
1908
Fix git symbolic-ref warning on initial clone
1909
Detect with git-p4 submit --direct when there are no changes in the working directory
1910
Make git-p4 submit --direct safer by also creating a git commit
1911
Added a rollback command for debugging. It sets back the heads of the p4 branches to the specified p4 change number or earlier.
1912
Fix branch detection in multi-branch imports
1913
Fixes for rollback, delete branches that did not exist at the specified p4 change
1914
Added support for importing multiple branches into refs/heads instead of just refs/remotes
1915
Added support for --max-changes=<count> to ease import debugging
1916
Use refs/heads/* instead of refs/heads/p4/* for local imports
1917
Doc updates
1918
Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)
1919
Make rollback work with locally imported branches
1920
Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed.
1921
Oops, fill the /list/ correct with the p4 exit code.
1922
Catch p4 errors in rollback early enough (before deleting refs!)
1923
Fix p4 execution in git-p4 rollback.
1924
Fix multi-branch import with --silent.
1925
Load the user map from p4 only once at run-time.
1926
Fix creating the remotes/p4 branches based on origin/* for the multi-branch import
1927
Forgot to remove this return statement from debugging
1928
Added support for --with-origin with multi-branch imports
1929
Oops, fix --with-origin to /really/ also call git fetch :)
1930
Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
1931
Make git-p4 work with packed refs (don't use os.path.exists to check for the
1932
Make --with-origin also work without origin :)
1933
Make --with-origin the default for syncing.
1934
Shortcut the case where we have no origin branch
1935
Forgot to remove this TODO item when I made --with-origin the default :)
1936
Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)
1937
Fix creation of refs/remotes/p4/HEAD symbolic ref
1938
Fix my email address, this isn't really KDE related :)
1939
In *_pipe print the command that failed if it fails.
1940
Fix typo in listExistingP4Branches that broke sync.
1941
Fix support for "depot-path" in older git-p4 imports
1942
Fix common path "calculation" from logs of multiple branches.
1943
Don't attempt to set the initialParent on multi-branch imports (useless).
1944
Hack to make the multi-branch import work again with self.depotPaths now that
1945
Fix git-p4 rebase
1946
Fix git-p4 submit
1947
Fix depot-path determination for git-p4 submit
1948
Make clone behave like git clone by default again.
1949
Make git-p4 submit detect the correct reference (origin) branch when
1950
Only get the expensive branch mapping from the p4 server when not
1951
Fixed the check to make sure to exclude the HEAD symbolic refs when updating
1952
Fix updating/creating remotes/p4/* heads from origin/p4/*
1953
Fix project name guessing
1954
Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)
1955
Fix support for explicit disabling of syncing with the origin
1956
Write out the options tag in the log message of imports only if we actually have
1957
Provide some information for single branch imports where the commits go
1958
Mention remotes/p4/master also in the documentation.
1959
git-p4 submit: Fix missing quotes around p4 commands to make them work with spaces in filenames
1960
Moved the code from git-p4 submit to figure out the upstream branch point
1961
Fix git-p4 rebase to detect the correct upstream branch instead of unconditionally
1962
Fix initial multi-branch import.
1963
Fix the branch mapping detection to be independent from the order of the "p4 branches" output.
1964
Warn about conflicting p4 branch mappings and use the first one found.
1965
Added git-p4 branches command that shows the mapping of perforce depot paths to imported git branches.
1966
Make it possible to specify the HEAD for the internal findUpstreamBranchPoint function.
1967
git-new-workdir: Fix shell warning about operator == used with test.
1968
1969
Sven Verdoolaege (4):
1970
git-update-ref: add --no-deref option for overwriting/detaching ref
1971
t9500: skip gitweb tests if perl version is too old
1972
git-submodule: provide easy way of adding new submodules
1973
git-clone: fetch possibly detached HEAD over dumb http
1974
1975
Theodore Ts'o (4):
1976
Add --aggressive option to 'git gc'
1977
Fix minor grammatical typos in the git-gc man page
1978
git-mergetool: Make default selection of merge-tool more intelligent
1979
Don't fflush(stdout) when it's not helpful
1980
1981
1
1982
Version v1.5.2.5; changes since v1.5.2.4:
2
1983
-----------------------------------------
3
1984
42
2023
glossary: add 'reflog'
43
2024
Fix "apply --reverse" with regard to whitespace
44
2025
45
Junio C Hamano (3):
46
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
2026
Junio C Hamano (2):
47
2027
Teach read-tree 2-way merge to ignore intermediate symlinks
48
2028
GIT 1.5.2.4
49
2029
76
2056
config: Complete documentation of --get-regexp
77
2057
config: Change output of --get-regexp for valueless keys
78
2058
79
Junio C Hamano (2):
80
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
2059
Junio C Hamano (1):
81
2060
GIT 1.5.2.3
82
2061
83
2062
Linus Torvalds (1):
129
2108
Johannes Sixt (1):
130
2109
Accept dates before 2000/01/01 when specified as seconds since the epoch
131
2110
132
Junio C Hamano (10):
2111
Junio C Hamano (6):
133
2112
checkout: do not get confused with ambiguous tag/branch names
134
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
135
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
136
Merge branch 'sv/objfixes' into maint
137
Merge branch 'ar/clone' into maint
138
2113
$EMAIL is a last resort fallback, as it's system-wide.
139
2114
git-branch --track: fix tracking branch computation.
140
2115
Avoid diff cost on "git log -z"
206
2181
git-gui: Give amend precedence to HEAD over MERGE_MSG
207
2182
git-gui: Save geometry before the window layout is damaged
208
2183
209
william pursell (1):
2184
William Pursell (1):
210
2185
Make command description imperative statement, not third-person present.
211
2186
212
2187
271
2246
Josh Triplett (1):
272
2247
Create a new manpage for the gitignore format, and reference it elsewhere
273
2248
274
Junio C Hamano (17):
2249
Junio C Hamano (6):
275
2250
annotate: make it work from subdirectories.
276
Merge branch 'maint-1.5.1' into maint
277
Merge branch 'maint-1.5.1' into maint
278
2251
git-cvsserver: fix disabling service via per-method config
279
Merge branch 'maint-1.5.1' into maint
280
Merge branch 'maint-1.5.1' into maint
281
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
282
2252
name-rev: tolerate clock skew in committer dates
283
Merge branch 'maint-1.5.1' into maint
284
Merge branch 'master' of git://repo.or.cz/git/fastimport into maint
285
2253
git-commit: use printf '%s\n' instead of echo on user-supplied strings
286
2254
Add tests for the last two fixes.
287
Merge branch 'maint-1.5.1' into maint
288
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
289
Merge branch 'maint-1.5.1' into maint
290
Merge branch 'maint-1.5.1' into maint
291
2255
GIT 1.5.2.1
292
2256
293
2257
Kristian Høgsberg (1):
404
2368
import-tars: Use the "Link indicator" to identify directories
405
2369
Add a birdview-on-the-source-code section to the user manual
406
2370
407
Junio C Hamano (29):
2371
Junio C Hamano (17):
408
2372
Minor copyediting on Release Notes for 1.5.2
409
2373
Add has_symlink_leading_path() function.
410
2374
apply: do not get confused by symlinks in the middle
411
2375
read-tree -m -u: avoid getting confused by intermediate symlinks.
2376
t9400: Use the repository config and nothing else.
412
2377
checkout: allow detaching to HEAD even when switching to the tip of a branch
413
Merge branch 'maint'
414
2378
git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
415
2379
Link to HTML version of external doc if available
416
Merge branch 'maint'
417
2380
Fix git-clone buglet for remote case.
418
2381
Prepare for 1.5.1.5 Release Notes
419
Merge branch 'maint'
420
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
421
Merge branch 'maint'
422
2382
gitweb: fix another use of undefined value
423
Merge branch 'master' of git://repo.or.cz/git-gui
424
Merge branch 'maint'
425
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
426
2383
GIT v1.5.1.5
427
Merge 1.5.1.5 in
428
2384
Add link to 1.5.1.5 release notes.
429
Merge branch 'sp/cvsexport'
430
2385
Documentation/git.txt: Update links to older documentation pages.
431
Merge branch 'maint'
432
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
433
2386
GIT 1.5.1.6
434
Merge branch 'maint' to synchronize with 1.5.1.6
435
2387
git-cvsserver: exit with 1 upon "I HATE YOU"
436
2388
GIT 1.5.2
437
2389
438
Junio Hamano (1):
439
t9400: Use the repository config and nothing else.
440
441
2390
Lars Hjemli (1):
442
2391
git-archive: don't die when repository uses subprojects
443
2392
520
2469
Johannes Sixt (1):
521
2470
git-gui: Call changes "Staged" and "Unstaged" in file list titles.
522
2471
523
Junio C Hamano (22):
524
Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint
525
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
526
Merge branch 'maint'
527
Merge branch 'master' of git://repo.or.cz/git-gui
2472
Junio C Hamano (10):
528
2473
diff: release blobs after generating textual diff.
529
2474
diff.c: do not use a separate "size cache".
530
2475
diff -M: release the preimage candidate blobs after rename detection.
531
2476
diff -S: release the image after looking for needle in it
532
2477
GIT v1.5.1.4
533
Merge branch 'maint'
534
2478
Update documentation links to point at 1.5.1.4
535
Merge branch 'jn/gitweb'
536
Merge branch 'jc/diffopt'
537
Merge branch 'fl/cvsserver'
538
2479
t9400: skip cvsserver test if Perl SQLite interface is unavailable
539
2480
git-clone: don't get fooled by $PWD
540
2481
.mailmap: add some aliases
541
Merge branch 'maint'
542
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
543
Merge branch 'maint'
544
Merge branch 'master' of git://repo.or.cz/git-gui
545
2482
GIT v1.5.2-rc3
546
2483
547
2484
Matthieu Moy (2):
571
2508
Fix documentation of tag in git-fast-import.txt
572
2509
Fix documentation of tag in git-fast-import.txt
573
2510
574
Shawn O. Pearce (36):
2511
Shawn O. Pearce (32):
575
2512
git-gui: Correctly handle UTF-8 encoded commit messages
576
2513
git-gui: Allow spaces in path to 'wish'
577
Merge branch 'maint'
578
2514
git-gui: Include the subject in the status bar after commit
579
2515
git-gui: Warn users before making an octopus merge
580
2516
git-gui: Correct line wrapping for too many branch message
590
2526
git-gui: Show all possible branches for merge
591
2527
git-gui: Include commit id/subject in merge choices
592
2528
git-gui: Use vi-like keys in merge dialog
593
Merge branch 'master' of git://repo.or.cz/git-gui
594
2529
Remove duplicate exports from Makefile
595
Merge branch 'maint'
596
2530
git-gui: Allow shift-{k,j} to select a range of branches to merge
597
2531
git-gui: Define a simple class/method system
598
2532
git-gui: Convert browser, console to "class" format
604
2538
git-gui: Cleanup minor nits in blame code
605
2539
git-gui: Format author/committer times in ISO format
606
2540
Use .git/MERGE_MSG in cherry-pick/revert
607
Merge branch 'gfi-maint' into maint
608
2541
git-gui: Paperbag fix blame in subdirectory
609
2542
git gui 0.7.0
610
2543
Correct error message in revert/cherry-pick
658
2591
Jonas Fonseca (1):
659
2592
git-tag(1): -v option is a subcommand; fix code block
660
2593
661
Junio C Hamano (10):
662
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
663
Merge branch 'maint'
2594
Junio C Hamano (6):
664
2595
blame: use .mailmap unconditionally
665
2596
diff.c: fix "size cache" handling.
666
Merge branch 'maint'
667
2597
blame: Notice a wholesale incorporation of an existing file.
668
2598
blame: -C -C -C
669
2599
Add test for blame corner cases.
670
Merge branch 'maint'
671
2600
GIT v1.5.2-rc2
672
2601
673
2602
Karl Hasselström (2):
680
2609
Martin Koegler (1):
681
2610
Fix compilation of test-delta
682
2611
683
Shawn O. Pearce (4):
684
Merge branch 'gfi-maint' into gfi-master
2612
Shawn O. Pearce (3):
685
2613
Reuse fixup_pack_header_footer in index-pack
686
2614
Don't use seq in tests, not everyone has it
687
2615
Improve request-pull to handle non-rebased branches
749
2677
Julian Phillips (1):
750
2678
http.c: Fix problem with repeated calls of http_init
751
2679
752
Junio C Hamano (37):
2680
Junio C Hamano (25):
753
2681
Move index-related variables into a structure.
754
2682
Make read-cache.c "the_index" free.
755
2683
Document "diff=driver" attribute
756
2684
t5302: avoid using tail -c
757
2685
t6030: grab commit object name as we go
758
2686
Build RPM with ETC_GITCONFIG=/etc/gitconfig
759
Merge branch 'maint'
760
2687
Diff between two blobs should take mode changes into account now.
761
2688
t/test-lib.sh: Protect ourselves from common misconfiguration
762
2689
gitattributes documentation: clarify overriding
763
2690
applymbox & quiltimport: typofix.
764
Merge branch 'master' of git://repo.or.cz/git/fastimport
765
Merge branch 'maint'
766
Merge branch 'mk/diff'
767
Merge branch 'jc/the-index'
768
2691
Add 'ident' conversion.
769
2692
Add 'filter' attribute and external filter driver definition.
770
2693
Add --date={local,relative,default}
771
2694
Start preparing for 1.5.1.3
772
Merge branch 'maint'
773
Merge branch 'maint'
774
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
775
2695
Do not barf on too long action description
776
2696
Update .mailmap with "Michael"
777
2697
Fix import-tars fix.
778
Merge branch 'maint'
779
Merge commit 'gfi/master'
780
2698
blame -s: suppress author name and time.
781
2699
Split out mailmap handling out of shortlog
782
2700
Apply mailmap in git-blame output.
783
2701
Make macros to prevent double-inclusion in headers consistent.
784
2702
Make sure test-genrandom and test-chmtime are builtas part of the main build.
785
Merge branch 'jc/attr'
786
2703
Fix symlink handling in git-svn, related to PerlIO
787
2704
GIT v1.5.1.3
788
Merge branch 'maint'
789
2705
GIT v1.5.2-rc1
790
2706
791
2707
Luiz Fernando N. Capitulino (5):
826
2742
Sami Farin (1):
827
2743
fast-import: size_t vs ssize_t
828
2744
829
Shawn O. Pearce (6):
2745
Shawn O. Pearce (4):
830
2746
Don't repack existing objects in fast-import
831
2747
Actually handle some-low memory conditions
832
2748
Don't allow empty pathnames in fast-import
833
Merge commit 'jc/maint' into gfi-maint
834
Merge branch 'gfi-maint' into gfi-master
835
2749
Catch empty pathnames in trees during fsck
836
2750
837
2751
Uwe Kleine-König (1):
925
2839
Julian Phillips (1):
926
2840
refs.c: add a function to sort a ref list, rather then sorting on add
927
2841
928
Junio C Hamano (127):
2842
Junio C Hamano (83):
929
2843
git-fetch: add --quiet
930
2844
t6002: minor spelling fix.
931
2845
git-rev-list: add --bisect-vars option.
932
2846
git-rev-list --bisect: optimization
933
2847
t6004: add a bit more path optimization test.
934
Merge branch 'master' into jc/bisect
935
2848
rev-list --bisect: Fix "halfway" optimization.
936
2849
make the previous optimization work also on path-limited rev-list --bisect
937
2850
Documentation: unbreak user-manual.
939
2852
checkout: allow detaching to HEAD even when switching to the tip of a branch
940
2853
_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
941
2854
git-read-tree --index-output=<file>
942
Merge branch 'lt/dirwalk'
943
Merge branch 'post1.5.1/p4'
944
Merge branch 'post1.5.1/tcltk'
945
Merge branch 'post1.5.1/blame.el'
946
Merge branch 'fl/doc'
947
Merge branch 'jc/bisect'
948
2855
add_cache_entry(): removal of file foo does not conflict with foo/bar
949
2856
unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
950
2857
unpack-trees: get rid of *indpos parameter.
957
2864
Rename internal function "add_file_to_cache" in builtin-update-index.c
958
2865
Rename static variable write_index to update_index in builtin-apply.c
959
2866
Rename add_file_to_index() to add_file_to_cache()
960
Merge branch 'maint'
961
2867
git-bisect: modernization
962
2868
t6030: add a bit more tests to git-bisect
963
2869
git-bisect: allow bisecting with only one bad commit.
964
Merge branch 'maint'
965
Merge branch 'jc/checkout' (early part)
966
Merge branch 'cc/bisect'
967
Merge branch 'fp/make-j'
968
Merge branch 'jc/index-output'
969
2870
git-push reports the URL after failing.
970
2871
git-push to multiple locations does not stop at the first failure
971
2872
A new merge stragety 'subtree'.
972
Merge branch 'maint'
973
Merge branch 'jc/read-tree-df' (early part)
974
2873
Start 1.5.2 cycle by prepareing RelNotes for it.
975
Merge branch 'maint'
976
Merge branch 'js/fetch-progress'
977
Merge branch 'jc/merge-subtree'
978
Merge branch 'jc/push'
979
2874
shortlog -w: make wrap-line behaviour optional.
980
2875
t1000: fix case table.
981
2876
Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
984
2879
t3030: merge-recursive backend test.
985
2880
git-fetch--tool pick-rref
986
2881
git-fetch: use fetch--tool pick-rref to avoid local fetch from alternate
987
Merge branch 'maint'
988
Merge branch 'maint'
989
2882
Add %m to '--pretty=format:'
990
2883
Refactor patch-id filtering out of git-cherry and git-format-patch.
991
2884
git-log --cherry-pick A...B
992
2885
Documentation: --cherry-pick
993
2886
Fix git {log,show,...} --pretty=email
994
Merge branch 'maint'
995
Merge branch 'jc/cherry'
996
Replace a pair of patches with updated ones for subproject support.
997
Merge branch 'maint'
998
2887
Add basic infrastructure to assign attributes to paths
999
2888
Define 'crlf' attribute.
1000
2889
Teach 'diff' about 'diff' attribute.
1004
2893
attribute macro support
1005
2894
Define a built-in attribute macro "binary".
1006
2895
Change attribute negation marker from '!' to '-'.
1007
Merge branch 'maint'
1008
Merge branch 'maint'
1009
2896
send-email: do not leave an empty CC: line if no cc is present.
1010
Merge branch 'js/wrap-log'
1011
2897
Make sure quickfetch is not fooled with a previous, incomplete fetch.
1012
2898
Allow more than true/false to attributes.
1013
2899
merge-recursive: separate out xdl_merge() interface.
1014
2900
git-gui: Honor TCLTK_PATH if supplied
1015
2901
Allow specifying specialized merge-backend per path.
1016
2902
Add a demonstration/test of customized merge.
1017
Merge branch 'jc/read-tree-df'
1018
Merge branch 'master' of git://repo.or.cz/git-gui
1019
Merge branch 'maint'
1020
2903
Update draft release notes for 1.5.2 with accumulated changes.
1021
Merge branch 'maint'
1022
Merge branch 'fl/cvsserver'
1023
2904
Custom low-level merge driver support.
1024
2905
Allow the default low-level merge driver to be configured.
1025
2906
Custom low-level merge driver: change the configuration scheme.
1026
2907
Allow low-level driver to specify different behaviour during internal merge.
1027
2908
Fix funny types used in attribute value representation
1028
Merge branch 'maint'
1029
2909
Counto-fix in merge-recursive
1030
2910
Simplify code to find recursive merge driver.
1031
Merge branch 'maint'
1032
2911
Documentation: support manual section (5) - file formats.
1033
2912
Update 'crlf' attribute semantics.
1034
2913
Document gitattributes(5)
1035
Merge branch 'maint'
1036
2914
git-add -u: match the index with working tree.
1037
2915
Fix bogus linked-list management for user defined merge drivers.
1038
2916
convert.c: restructure the attribute checking part.
1039
2917
lockfile: record the primary process.
1040
Merge branch 'maint'
1041
Merge branch 'jc/quickfetch'
1042
Merge branch 'jp/refs'
1043
Merge branch 'np/pack'
1044
Merge branch 'lt/gitlink'
1045
Merge branch 'jc/attr'
1046
Merge branch 'jc/add'
1047
Merge branch 'lt/objalloc'
1048
2918
Update documentation links to point at v1.5.1.2
1049
2919
Documentation/Makefile: fix section (5) installation
1050
2920
Update draft release notes for v1.5.2
1131
3001
Add custom subject prefix support to format-patch (take 3)
1132
3002
Add testcase for format-patch --subject-prefix (take 3)
1133
3003
1134
Shawn O. Pearce (9):
3004
Shawn O. Pearce (8):
1135
3005
Always bind the return key to the default button
1136
3006
Fix lost-found to show commits only referenced by reflogs
1137
3007
Don't yap about merge-subtree during make
1138
Merge branch 'er/ui'
1139
3008
git-gui: Display the directory basename in the title
1140
3009
Revert "Allow wish interpreter to be defined with TCLTK_PATH"
1141
3010
Contribute a fairly paranoid update hook
1168
3037
Johan Herland (1):
1169
3038
user-manual: Add section on ignoring files
1170
3039
1171
Junio C Hamano (2):
1172
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
3040
Junio C Hamano (1):
1173
3041
GIT 1.5.1.6
1174
3042
1175
3043
Matthias Kestenholz (2):
1225
3093
import-tars: Use the "Link indicator" to identify directories
1226
3094
Add a birdview-on-the-source-code section to the user manual
1227
3095
1228
Junio C Hamano (10):
3096
Junio C Hamano (7):
1229
3097
git-clone: don't get fooled by $PWD
1230
3098
.mailmap: add some aliases
1231
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
1232
3099
checkout: allow detaching to HEAD even when switching to the tip of a branch
1233
3100
git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
1234
3101
Fix git-clone buglet for remote case.
1235
3102
Prepare for 1.5.1.5 Release Notes
1236
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
1237
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
1238
3103
GIT v1.5.1.5
1239
3104
1240
3105
Marco Costalba (1):
1258
3123
Fix documentation of tag in git-fast-import.txt
1259
3124
Fix documentation of tag in git-fast-import.txt
1260
3125
1261
Shawn O. Pearce (2):
3126
Shawn O. Pearce (1):
1262
3127
Properly handle '0' filenames in import-tars
1263
Merge branch 'gfi-maint' into maint
1264
3128
1265
3129
Steffen Prohaska (3):
1266
3130
tiny fix in documentation of git-clone
1320
3184
Johannes Schindelin (1):
1321
3185
Teach import-tars about GNU tar's @LongLink extension.
1322
3186
1323
Junio C Hamano (8):
1324
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
3187
Junio C Hamano (5):
1325
3188
diff.c: fix "size cache" handling.
1326
3189
blame: Notice a wholesale incorporation of an existing file.
1327
3190
blame: -C -C -C
1328
3191
Add test for blame corner cases.
1329
Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint
1330
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
1331
3192
GIT v1.5.1.4
1332
3193
1333
3194
Karl Hasselström (2):
1397
3258
Julian Phillips (1):
1398
3259
http.c: Fix problem with repeated calls of http_init
1399
3260
1400
Junio C Hamano (9):
3261
Junio C Hamano (8):
1401
3262
Build RPM with ETC_GITCONFIG=/etc/gitconfig
1402
3263
applymbox & quiltimport: typofix.
1403
3264
Start preparing for 1.5.1.3
1404
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
1405
3265
Do not barf on too long action description
1406
3266
Update .mailmap with "Michael"
1407
3267
Fix import-tars fix.
1423
3283
Document --dry-run and envelope-sender for git-send-email.
1424
3284
Sanitize @to recipients.
1425
3285
1426
Shawn O. Pearce (4):
3286
Shawn O. Pearce (3):
1427
3287
Actually handle some-low memory conditions
1428
3288
Don't allow empty pathnames in fast-import
1429
Merge commit 'jc/maint' into gfi-maint
1430
3289
Catch empty pathnames in trees during fsck
1431
3290
1432
3291
1487
3346
Jim Meyering (1):
1488
3347
sscanf/strtoul: parse integers robustly
1489
3348
1490
Junio C Hamano (6):
3349
Junio C Hamano (4):
1491
3350
Do not default to --no-index when given two directories.
1492
Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint
1493
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
1494
3351
Start preparing for 1.5.1.2
1495
3352
git-clone: fix dumb protocol transport to clone from pack-pruned ref
1496
3353
GIT 1.5.1.2
1625
3482
Julian Phillips (1):
1626
3483
contrib/workdir: add a simple script to create a working directory
1627
3484
1628
Junio C Hamano (9):
1629
Merge branch 'master' of git://repo.or.cz/git/mergetool.git
1630
Merge branch 'maint'
3485
Junio C Hamano (6):
1631
3486
Update draft release notes for 1.5.1
1632
3487
Do not bother documenting fetch--tool
1633
3488
Hopefully final update to the draft Release Notes, preparing for 1.5.1
1634
3489
rerere should not repeat the earlier hunks in later ones
1635
3490
GIT 1.5.0.7
1636
Merge 1.5.0.7 in
1637
3491
GIT 1.5.1
1638
3492
1639
3493
Nicolas Pitre (1):
1694
3548
Johannes Schindelin (1):
1695
3549
t4118: be nice to non-GNU sed
1696
3550
1697
Junio C Hamano (8):
3551
Junio C Hamano (7):
1698
3552
Document git-log --first-parent
1699
3553
sha1_file.c (write_sha1_file): Detect close failure
1700
3554
git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
1701
3555
Fix "--pretty=format:" for parent related items.
1702
3556
GIT 1.5.0.6
1703
Merge branch 'maint' to synchronize with 1.5.0.6
1704
3557
Update main git.html page to point at 1.5.0.6 documentation
1705
3558
GIT 1.5.1-rc3
1706
3559
1767
3620
Johannes Sixt (1):
1768
3621
Teach git-remote to list pushed branches.
1769
3622
1770
Junio C Hamano (24):
3623
Junio C Hamano (15):
1771
3624
git-log --first-parent: show only the first parent log
1772
3625
blame: micro-optimize cmp_suspect()
1773
Merge git://git2.kernel.org/pub/scm/gitk/gitk
1774
3626
blame: cmp_suspect is not "cmp" anymore.
1775
3627
Teach tree_entry_interesting() that the tree entries are sorted.
1776
3628
tree-diff: avoid strncmp()
1777
3629
tree_entry_interesting(): allow it to say "everything is interesting"
1778
3630
git-rebase: make 'rebase HEAD branch' work as expected.
1779
Merge branch 'maint'
1780
Merge git://git2.kernel.org/pub/scm/gitk/gitk
1781
3631
git-apply: Do not free the wrong buffer when we convert the data for writeout
1782
3632
checkout: report where the new HEAD is upon detaching HEAD
1783
3633
git-bisect: typofix
1784
3634
git-bisect.sh: properly dq $GIT_DIR
1785
3635
Fix path-limited "rev-list --bisect" termination condition.
1786
Merge branch 'maint'
1787
3636
git-am documentation: describe what is taken from where.
1788
Merge branch 'maint'
1789
Merge branch 'js/remote-show-push'
1790
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
1791
Merge branch 'maint'
1792
3637
Update README to point at a few key periodical messages to the list
1793
Merge branch 'jc/fpl'
1794
3638
GIT 1.5.1-rc2
1795
3639
1796
3640
Li Yang (1):
2071
3915
git-branch: improve abbreviation of sha1s in verbose mode
2072
3916
git-branch: document new --no-abbrev option
2073
3917
2074
Junio C Hamano (158):
3918
Junio C Hamano (80):
2075
3919
git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)
2076
3920
Make merge-base a built-in.
2077
3921
Allow in_merge_bases() to take more than one reference commits.
2078
3922
Remove git-resolve.
2079
3923
Remove git-diff-stages.
2080
3924
Add link to v1.5.0 documentation.
2081
Merge branch 'jc/deprecate'
2082
Merge branch 'jc/merge-base' (early part)
2083
Merge branch 'jc/diff-apply-patch'
2084
Merge branch 'js/reverse'
2085
3925
blame: --show-stats for easier optimization work.
2086
3926
git-fetch: split fetch_main into fetch_dumb and fetch_native
2087
3927
git-fetch--tool: start rewriting parts of git-fetch in C.
2088
3928
git-fetch: move more code into C.
2089
3929
git-fetch: rewrite another shell loop in C
2090
3930
git-fetch: rewrite expand_ref_wildcard in C
2091
Merge branch 'maint'
2092
3931
Document --ignore-space-at-eol option.
2093
3932
Add RelNotes 1.5.1
2094
3933
Point top-level RelNotes link at 1.5.1 release notes being prepared.
2095
3934
t0020: add test for auto-crlf
2096
Merge branch 'maint'
2097
3935
remotes.not-origin.tagopt
2098
Merge branch 'maint'
2099
Merge branch 'maint'
2100
3936
Teach 'git apply' to look at $GIT_DIR/config
2101
3937
Teach core.autocrlf to 'git apply'
2102
Merge branch 'maint'
2103
3938
Update draft release notes for 1.5.1
2104
3939
Teach 'git apply' to look at $HOME/.gitconfig even outside of a repository
2105
Merge branch 'maint'
2106
Merge branch 'ap/cvsserver'
2107
Merge branch 'maint'
2108
Merge branch 'jc/fetch-notags'
2109
Merge branch 'js/diff-color-check'
2110
3940
git-apply: do not lose cwd when run from a subdirectory.
2111
3941
git-apply: require -p<n> when working in a subdirectory.
2112
3942
Link 1.5.0.1 documentation from the main page.
2113
Merge branch 'maint'
2114
3943
Add prefixcmp()
2115
3944
Mechanical conversion to use prefixcmp()
2116
3945
prefixcmp(): fix-up mechanical conversion.
2117
3946
prefixcmp(): fix-up leftover strncmp().
2118
Merge branch 'js/name-rev-fix'
2119
Merge branch 'fk/autoconf'
2120
3947
t4119: add test for traditional patch and different p_value
2121
3948
Fix botched "leak fix"
2122
Merge branch 'maint'
2123
3949
git-apply: notice "diff --git" patch again
2124
3950
git-apply: guess correct -p<n> value for non-git patches.
2125
3951
t4119: test autocomputing -p<n> for traditional diff input.
2126
3952
git-status: do not be totally useless in a read-only repository.
2127
3953
update-index: do not die too early in a read-only repository.
2128
3954
run_diff_{files,index}(): update calling convention.
2129
Merge branch 'maint'
2130
Merge branches 'lt/crlf' and 'jc/apply-config'
2131
3955
.mailmap maintenance after pulling from git-svn
2132
3956
bundle: reword missing prerequisite error message
2133
Merge branch 'maint'
2134
Merge branch 'js/etc-config'
2135
Merge branch 'js/no-limit-boundary'
2136
Merge branch 'js/apply'
2137
Evil Merge branch 'jc/status' (early part) into js/diff-ni
2138
3957
git-fetch--tool takes flags before the subcommand.
2139
Merge branch 'maint'
2140
3958
diff --cached: give more sensible error message when HEAD is yet to be created.
2141
Merge branch 'maint'
2142
Merge branch 'maint'
2143
3959
Documentation: link in 1.5.0.2 material to the top documentation page.
2144
Merge branch 'master' into js/diff-ni
2145
Merge branch 'maint'
2146
Merge branch 'np/types' into jc/fetch
2147
3960
builtin-fetch--tool: adjust to updated sha1_object_info().
2148
3961
Make 'cvs ci' lockless in git-cvsserver by using git-update-ref
2149
3962
fetch--tool: fix uninitialized buffer when reading from stdin
2150
Merge branch 'maint'
2151
Merge branch 'js/diff-ni' (early part)
2152
Merge branch 'mc/sendmail'
2153
3963
builtin-fetch--tool: make sure not to overstep ls-remote-result buffer.
2154
Merge branch 'np/types'
2155
3964
index_fd(): use enum object_type instead of type name string.
2156
3965
index_fd(): pass optional path parameter as hint for blob conversion
2157
3966
index_fd(): convert blob only if it is a regular file.
2158
Merge branch 'maint'
2159
Merge branch 'js/bundle'
2160
Merge branch 'js/commit-by-name'
2161
3967
Add recent changes to draft 1.5.1 release notes.
2162
3968
git-fetch: retire update-local-ref which is not used anymore.
2163
3969
builtin-fetch--tool: fix reflog notes.
2164
Merge branch 'maint'
2165
Merge branch 'js/commit-format'
2166
Merge branch 'maint'
2167
Merge branch 'maint'
2168
Merge branch 'js/diff-ni' (early part)
2169
3970
diff-ni: allow running from a subdirectory.
2170
3971
diff-ni: fix the diff with standard input
2171
3972
.gitignore: add git-fetch--tool
2172
Merge branch 'maint'
2173
Merge branch 'js/symlink'
2174
Merge branch 'js/fetch-progress' (early part)
2175
3973
format-patch --attach: not folding some long headers.
2176
3974
Post 1.5.0.3 cleanup
2177
3975
fsck: fix broken loose object check.
2178
3976
unpack_sha1_file(): detect corrupt loose object files.
2179
3977
fsck: exit with non-zero status upon errors
2180
Merge branch 'master-for-junio' of git://repo.or.cz/git/fastimport; branch 'maint'
2181
Merge branch 'maint'
2182
3978
git-bundle: fix pack generation.
2183
Merge branch 'maint'
2184
3979
revision walker: Fix --boundary when limited
2185
3980
revision traversal: retire BOUNDARY_SHOW
2186
3981
git-bundle: various fixups
2188
3983
git-bundle: make verify a bit more chatty.
2189
3984
revision --boundary: fix stupid typo
2190
3985
revision --boundary: fix uncounted case.
2191
Merge branch 'maint'
2192
Merge branch 'master' of git://repo.or.cz/git/fastimport
2193
Merge branch 'js/config-rename'
2194
Merge branch 'maint'
2195
Merge branch 'sp/make'
2196
Merge branch 'js/revert-cherry'
2197
Merge branch 'pb/commit-i'
2198
Merge branch 'jc/fsck'
2199
Merge branch 'js/diff-ni'
2200
Merge branch 'js/attach'
2201
3986
Fix broken create_branch() in builtin-branch.
2202
3987
prepare_packed_git(): sort packs by age and localness.
2203
Merge branch 'jc/boundary'
2204
Merge branch 'maint'
2205
Merge branch 'master' of git://repo.or.cz/git/fastimport
2206
Merge branch 'maint'
2207
Merge branch 'master' of git://repo.or.cz/git-gui
2208
Merge branch 'master' of git://repo.or.cz/git/mergetool
2209
3988
Documentation: add git-mergetool to the command list.
2210
3989
shortlog: prompt when reading from terminal by mistake
2211
Merge branch 'pb/branch-track'
2212
Merge branch 'maint'
2213
Merge branch 'jb/per-user-exclude'
2214
Merge branch 'dz/mailinfo'
2215
Merge branch 'jc/fetch'
2216
Merge branch 'jc/repack'
2217
Merge GIT 1.5.0.4
2218
3990
Remove unused diffcore_std_no_resolve
2219
3991
diff --quiet
2220
3992
Teach --quiet to diff backends.
2221
3993
revision.c: explain what tree_difference does
2222
3994
try-to-simplify-commit: use diff-tree --quiet machinery.
2223
3995
applymbox: brown paper bag fix.
2224
Merge branch 'maint'
2225
Merge 1.5.0.5 in from 'maint'
2226
Merge branch 'ar/diff'
2227
3996
Update main git.html page to point at 1.5.0.5 documentation
2228
Merge branch 'sp/run-command'
2229
Merge branch 'fl/cvsserver'
2230
Merge branch 'jb/gc'
2231
3997
Fix merge-index
2232
3998
GIT 1.5.1-rc1
2233
3999
2287
4053
Sergey Vlasov (1):
2288
4054
Documentation/git-svn.txt: Fix formatting errors
2289
4055
2290
Shawn O. Pearce (46):
4056
Shawn O. Pearce (43):
2291
4057
Cleanup check_valid in commit-tree.
2292
Merge branch 'maint'
2293
4058
cherry-pick: Bug fix 'cherry picked from' message.
2294
4059
Make 'make' quieter while building git
2295
4060
Make 'make' quiet by default
2318
4083
Refactor run_command error handling in receive-pack
2319
4084
Split back out update_hook handling in receive-pack
2320
4085
Change {pre,post}-receive hooks to use stdin
2321
Merge branch 'maint'
2322
Merge branch 'maint'
2323
4086
Remove unnecessary casts from fast-import
2324
4087
Simplify closing two fds at once in run-command.c
2325
4088
Fix t5510-fetch's use of sed
2389
4152
Johannes Schindelin (1):
2390
4153
t4118: be nice to non-GNU sed
2391
4154
2392
Junio C Hamano (3):
2393
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
4155
Junio C Hamano (2):
2394
4156
git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
2395
4157
GIT 1.5.0.6
2396
4158
2447
4209
Begin SubmittingPatches with a check list
2448
4210
make t8001 work on Mac OS X again
2449
4211
2450
Junio C Hamano (8):
2451
Merge branch 'maint-for-junio' of git://repo.or.cz/git/fastimport into maint
4212
Junio C Hamano (3):
2452
4213
git-commit: cd to top before showing the final stat
2453
Merge branch 'master' of git://repo.or.cz/git-gui into maint
2454
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
2455
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
2456
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
2457
4214
git-checkout: fix "eval" used for merge labelling.
2458
4215
GIT 1.5.0.4
2459
4216
2590
4347
Johannes Schindelin (1):
2591
4348
git-diff: fix combined diff
2592
4349
2593
Junio C Hamano (14):
2594
Merge branch 'master' of git://repo.or.cz/git-gui into maint
4350
Junio C Hamano (11):
2595
4351
Reword git-am 3-way fallback failure message.
2596
4352
diff-patch: Avoid emitting double-slashes in textual patch.
2597
4353
Don't modify CREDITS-FILE if it hasn't changed.
2598
Merge git://repo.or.cz/git-gui into maint
2599
4354
rerere: do not skip two conflicted paths next to each other.
2600
4355
rerere: do not deal with symlinks.
2601
4356
Add Release Notes to prepare for 1.5.0.2
2602
4357
merge-index: fix longstanding bug in merging symlinks
2603
4358
merge-recursive: fix longstanding bug in merging symlinks
2604
Merge branch 'jc/merge-symlink' into maint
2605
4359
diff --cc: fix display of symlink conflicts during a merge.
2606
4360
Documentation: describe "-f/-t/-m" options to "git-remote add"
2607
4361
GIT 1.5.0.2
2654
4408
Read the config in rev-list
2655
4409
Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding
2656
4410
2657
Junio C Hamano (16):
4411
Junio C Hamano (15):
2658
4412
Documentation: Drop full-stop from git-fast-import title.
2659
4413
cmd-list: add git-remote
2660
4414
Makefile: update check-docs target
2668
4422
pretend-sha1: grave bugfix.
2669
4423
git-merge: minor fix for no_trivial_merge_strategies.
2670
4424
Do not take mode bits from index after type change.
2671
Merge git://git.kernel.org/pub/scm/gitk/gitk into maint
2672
4425
Update draft release notes for 1.5.0.1
2673
4426
GIT 1.5.0.1
2674
4427
2733
4486
log --reflog: use dwim_log
2734
4487
git-gc: run pack-refs by default unless the repo is bare
2735
4488
2736
Junio C Hamano (22):
4489
Junio C Hamano (17):
2737
4490
create_symref(): create leading directories as needed.
2738
Merge branch 'master' of git://repo.or.cz/git/fastimport
2739
4491
reflog: handle $name => remotes/%s/HEAD mapping consistently for logs
2740
4492
Documentation/git-pull: describe default behaviour and config interactions
2741
4493
git-fetch: document automatic tag following.
2742
4494
wt_status_prepare(): clean up structure initialization.
2743
4495
diff_flush_name(): take struct diff_options parameter.
2744
4496
t4016: test quoting funny pathnames in diff output
2745
Merge branch 'master' of git://repo.or.cz/git/fastimport
2746
4497
Documentation: git-rebase -C<n>
2747
4498
Teach git-am to pass -p option down to git-apply
2748
4499
Add discussion section to git-tag documentation.
2749
Merge git-gui
2750
Merge branch 'master' of git://repo.or.cz/git-gui
2751
4500
Add RPM target for git-gui
2752
4501
Do not forget to pack objects reachable from HEAD reflog.
2753
4502
for-each-reflog: not having $GIT_DIR/logs directory is not an error.
2754
4503
"git-fetch --tags $URL" should not overwrite existing tags
2755
4504
Documentation: Moving out of detached HEAD does not warn anymore.
2756
Merge branch 'master' of git://repo.or.cz/git-gui
2757
4505
Add release notes to the distribution.
2758
4506
GIT 1.5.0
2759
4507
3144
4892
Commands requiring a work tree must not run in GIT_DIR
3145
4893
fast-import: Fix compile warnings
3146
4894
3147
Junio C Hamano (41):
4895
Junio C Hamano (36):
3148
4896
create_symref(): do not assume pathname from git_path() persists long enough
3149
4897
detached HEAD -- finishing touches
3150
4898
Use "git checkout -q" in git-bisect
3155
4903
honor GIT_REFLOG_ACTION in git-commit
3156
4904
Why is it bad to rewind a branch that has already been pushed out?
3157
4905
combine-diff: special case --unified=0
3158
Merge branch 'master' into np/dreflog
3159
4906
show-branch -g: default to the current branch.
3160
4907
git-clone --reference: saner handling of borrowed symrefs.
3161
Merge branch 'np/dreflog'
3162
4908
Revert "Allow branch.*.merge to talk about remote tracking branches."
3163
4909
Rename get_ident() to fmt_ident() and make it available to outside
3164
4910
t9200: Work around HFS+ issues.
3175
4921
annotate: fix for cvsserver.
3176
4922
S_IFLNK != 0140000
3177
4923
Remove contrib/colordiff
3178
Merge branch 'master' of git://repo.or.cz/git/fastimport
3179
4924
Add deprecation notices.
3180
4925
Remove git-merge-recur
3181
4926
git-clone --reference: work well with pack-ref'ed reference repository
3182
Merge branch 'master' of git://repo.or.cz/git/fastimport
3183
4927
for-each-reflog: fix case for empty log directory
3184
Merge branch 'ml/gitk' (early part)
3185
4928
t4200: skip gc-rerere test on systems with non GNU date.
3186
4929
git-add -i: update removed path correctly.
3187
4930
Documentation: Add gfi to the main command list.
3195
4938
gitk - remove trailing whitespace from a few lines.
3196
4939
Make gitk work reasonably well on Cygwin.
3197
4940
4941
Michael Coleman (1):
4942
Fix some documentation typos and grammar
4943
3198
4944
Michele Ballabio (1):
3199
4945
Documentation: add KMail in SubmittingPatches
3200
4946
3201
Mike Coleman (1):
3202
Fix some documentation typos and grammar
3203
3204
4947
Nicolas Pitre (14):
3205
4948
make reflog filename independent from struct ref_lock
3206
4949
lock_ref_sha1_basic(): remember the original name of a ref when resolving it
3224
4967
Robin Rosenberg (1):
3225
4968
Why is it bad to rewind a branch that has already been pushed out?
3226
4969
3227
Shawn O. Pearce (115):
4970
Shawn O. Pearce (113):
3228
4971
Created fast-import, a tool to quickly generating a pack from blobs.
3229
4972
Added automatic index generation to fast-import.
3230
4973
Cleaned up memory allocation for object_entry structs.
3263
5006
Fix repository corruption when using marks for modified blobs.
3264
5007
Support creation of merge commits in fast-import.
3265
5008
Allow creating branches without committing in fast-import.
3266
Merge branch 'master' into sp/fast-import
3267
5009
Improve reuse of sha1_file library within fast-import.
3268
5010
Misc. type cleanups within fast-import.
3269
5011
Restructure fast-import to support creating multiple packfiles.
3294
5036
Create test case for fast-import.
3295
5037
Reduce value duplication in t9300-fast-import.
3296
5038
Accept 'inline' file data in fast-import commit structure.
3297
Merge branch 'master' into sp/gfi
3298
5039
Pull out remote listing functions in git-remote.
3299
5040
Teach 'git remote' how to cleanup stale tracking branches.
3300
5041
Cleanup prepare_packed_git_one to reuse install_packed_git.
3387
5128
Eric Wong (1):
3388
5129
git-svn: remove leading slash when printing removed directories
3389
5130
3390
J. Bruce Fields (32):
5131
J. Bruce Fields (31):
3391
5132
Documentation: add git user's manual
3392
5133
Documentation: expand preface and todo's
3393
5134
Documentation: git-rebase discussion, miscellaneous user-manual updates
3398
5139
user manual: answer some comments from Junio
3399
5140
user-manual: replace init-db by init
3400
5141
user-manual: reindent
3401
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
3402
5142
user-manual: rewrap, fix heading levels
3403
5143
user-manual: add "quick start" as chapter 1
3404
5144
user-manual: minor quickstart reorganization
3442
5182
Johannes Sixt (1):
3443
5183
Add a missing fork() error check.
3444
5184
3445
Junio C Hamano (44):
5185
Junio C Hamano (43):
3446
5186
User manual: fix typos in examples
3447
5187
Documentation/tutorial-2: Fix interesting typo in an example.
3448
5188
Revert "prune: --grace=time"
3483
5223
Documentation: "git-checkout <tree> <path>" takes any tree-ish
3484
5224
t9200: Re-code non-ascii path test in UTF-8
3485
5225
t9200: do not test -x bit if the filesystem does not support it.
3486
Merge branch 'master' of git://linux-nfs.org/~bfields/git
3487
5226
git main documentation: point at the user's manual.
3488
5227
Do not use hardcoded path to xhmtl.xsl to generate user's manual
3489
5228
GIT v1.5.0-rc3
3577
5316
--walk-reflogs: actually find the right commit by date.
3578
5317
--walk-reflogs: do not crash with cyclic reflog ancestry
3579
5318
3580
Junio C Hamano (73):
5319
Junio C Hamano (69):
3581
5320
reflog-expire: brown paper bag fix.
3582
5321
merge-recursive: do not report the resulting tree object name
3583
5322
Explain "Not a git repository: '.git'".
3591
5330
git-commit documentation: -a adds and also removes
3592
5331
Consistent message encoding while reusing log from an existing commit.
3593
5332
More tests in t3901.
3594
Merge branch 'jc/subdir'
3595
Merge branch 'sp/merge' (early part)
3596
Merge branch 'jc/int'
3597
5333
git log documentation: teach -<n> form.
3598
5334
Add describe test.
3599
5335
Documentation: merge-output is not too verbose now.
3600
5336
Use merge-recursive in git-revert/git-cherry-pick
3601
Merge git://git.kernel.org/pub/scm/gitk/gitk
3602
5337
git reflog expire: document --stale-fix option.
3603
5338
Fix git-fetch while on detached HEAD not to give needlessly alarming errors
3604
5339
git-push documentation: remaining bits
3818
5553
Sanitize for_each_reflog_ent()
3819
5554
Fix t1410 for core.filemode==false
3820
5555
3821
Junio C Hamano (127):
5556
Junio C Hamano (106):
3822
5557
We should make sure that the protocol is still extensible.
3823
5558
Why does it mean we do not have to register shallow if we have one?
3824
5559
Why didn't we mark want_obj as ~UNINTERESTING in the old code?
3829
5564
reflog: fix warning message.
3830
5565
Move in_merge_bases() to commit.c
3831
5566
git reflog expire
3832
Merge branch 'master' into jc/fsck-reflog
3833
5567
reflog expire: prune commits that are not incomplete
3834
5568
reflog expire: do not punt on tags that point at non commits.
3835
5569
show-branch --reflog: add documentation.
3839
5573
i18n.logToUTF8: convert commit log message to UTF-8
3840
5574
Teach log family --encoding
3841
5575
everyday: update for v1.5.0
3842
Merge branch 'jc/fsck-reflog'
3843
5576
count-objects -v: show number of packs as well.
3844
5577
rerere gc: honor configuration and document it
3845
5578
git-reflog: gc.* configuration and documentation.
3846
5579
everyday: replace a few 'prune' and 'repack' with 'gc'
3847
Merge branch 'master' into js/shallow
3848
5580
Use 'repack -a -d -l' instead of 'repack -a -d' in git-gc
3849
5581
Set NO_MMAP for Cygwin by default
3850
5582
UTF-8: introduce i18n.logoutputencoding.
3851
Merge branch 'sp/gc'
3852
5583
gcc does not necessarily pass runtime libpath with -R
3853
5584
Work around http-fetch built with cURL 7.16.0
3854
5585
Rename t3900 test vector file
3855
Merge branch 'js/shallow'
3856
Merge branch 'jc/make'
3857
5586
t3900: test conversion to non UTF-8 as well
3858
5587
GIT_SKIP_TESTS: allow users to omit tests that are known to break
3859
5588
core.logallrefupdates: log remotes/ tracking branches.
3860
5589
Allow non-fast-forward of remote tracking branches in default clone
3861
Merge branch 'jc/utf8'
3862
5590
t5400 send-pack test: try a bit more nontrivial transfer.
3863
5591
Revert "read_directory: show_both option."
3864
5592
Fix 'git add' with .gitignore
3865
Merge branch 'jc/curl'
3866
5593
pack-objects: fix use of use_pack().
3867
5594
mmap: set FD_CLOEXEC for file descriptors we keep open for mmap()
3868
5595
send-pack: fix pipeline.
3875
5602
commit-tree: cope with different ways "utf-8" can be spelled.
3876
5603
i18n: drop "encoding" header in the output after re-coding.
3877
5604
Documentation/config.txt (and repo-config manpage): mark-up fix.
3878
Merge branch 'master' into sp/mmap
3879
Merge branch 'jc/send-pack-pipeline'
3880
5605
Update documentation for update hook.
3881
5606
send-pack.c: use is_null_sha1()
3882
5607
send-pack: tell pack-objects to use its internal rev-list.
3885
5610
Update send-pack pipeline documentation.
3886
5611
fail pull/merge early in the middle of conflicted merge
3887
5612
git-fetch: remove .keep file at the end.
3888
Merge branch 'sp/merge' (early part)
3889
5613
Strongly discourage --update-head-ok in fetch-options documentation.
3890
5614
Update clone/fetch documentation with --depth (shallow clone) option
3891
5615
Remove unused variable (git-commit.sh)
3894
5618
tutorial: misc updates.
3895
5619
git-verify-tag: make sure we remove temporary file.
3896
5620
pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
3897
Merge branch 'maint'
3898
5621
rerere: Fix removal of already resolved path.
3899
5622
git-remote
3900
5623
builtin-prune: memory diet.
3906
5629
reflog --fix-stale: do not check the same trees and commits repeatedly.
3907
5630
diff-index --cached --raw: show tree entry on the LHS for unmerged entries.
3908
5631
git-reset <tree> -- <path> restores absense of <path> in <tree>
3909
Merge branch 'jc/remote'
3910
Merge branch 'jr/status'
3911
5632
Spell default packedgitlimit slightly differently
3912
Merge branch 'sp/mmap'
3913
5633
Move initialization of log_all_ref_updates
3914
5634
Introduce is_bare_repository() and core.bare configuration variable
3915
5635
git-fetch: allow updating the current branch in a bare repository.
3921
5641
git-checkout: fix branch name output from the command
3922
5642
--utf8 is now default for 'git-am'
3923
5643
--prune is now default for 'pack-refs'
3924
Merge branch 'jc/reflog'
3925
5644
rm git-rerere.perl -- it is now a built-in.
3926
5645
merge-base: do not leak commit list
3927
5646
Do not ignore a detected patchfile brokenness.
3928
5647
Fix "Do not ignore a detected patchfile brokenness."
3929
Merge branch 'maint'
3930
5648
builtin-archive: do not free a tree held by the object layer.
3931
5649
git-checkout: safety check for detached HEAD checks existing refs
3932
5650
git-checkout: handle local changes sanely when detaching HEAD
3934
5652
-u is now default for 'git-applymbox'
3935
5653
-u is now default for 'git-mailinfo'.
3936
5654
Makefile: remove $foo when $foo.exe is built/installed.
3937
Merge branch 'js/reflog'
3938
5655
merge-recursive: do not use on-file index when not needed.
3939
5656
Document git-init
3940
5657
index-pack: write-or-die instead of unchecked write-in-full.
3941
5658
config-set: check write-in-full returns in set_multivar
3942
5659
git-rm: do not fail on already removed file.
3943
5660
git-status: wording update to deal with deleted files.
3944
Merge branch 'jc/detached-head'
3945
Merge branch 'ar/merge-recursive'
3946
Merge branch 'jc/bare'
3947
5661
plug a few leaks in revision walking used in describe.
3948
5662
GIT v1.5.0-rc1
3949
5663
4228
5942
Add branch.*.merge warning and documentation update
4229
5943
Move "no merge candidate" warning into git-pull
4230
5944
4231
Junio C Hamano (172):
5945
Junio C Hamano (115):
4232
5946
upload-pack: stop the other side when they have more roots than we do.
4233
5947
apply --numstat: mark binary diffstat with - -, not 0 0
4234
5948
pack-objects: tweak "do not even attempt delta" heuristics
4241
5955
git-fetch: fix dumb protocol transport to fetch from pack-pruned ref
4242
5956
git-fetch: allow glob pattern in refspec
4243
5957
refs outside refs/{heads,tags} match less strongly.
4244
Merge branch 'jc/upload-pack'
4245
5958
Typefix builtin-prune.c::prune_object()
4246
Merge branch 'ap/prune'
4247
Merge branch 'ap/branch-ref-display'
4248
Merge branch 'jc/numstat'
4249
Merge branch 'jc/pack-heuristics'
4250
Merge branch 'pb/diffroot'
4251
Merge branch 'jn/web'
4252
5959
Allow git push to delete remote ref.
4253
5960
gitweb: (style) use chomp without parentheses consistently.
4254
5961
git-clone: stop dumb protocol from copying refs outside heads/ and tags/.
4257
5964
git-shortlog: make common repository prefix configurable with .mailmap
4258
5965
git-commit: show --summary after successful commit.
4259
5966
git-fetch: exit with non-zero status when fast-forward check fails
4260
Merge branch 'master' into jc/globfetch
4261
5967
git-fetch: allow forcing glob pattern in refspec
4262
5968
fetch-pack: do not barf when duplicate re patterns are given
4263
Merge branch 'jn/web'
4264
5969
grep: do not skip unmerged entries when grepping in the working tree.
4265
Merge branch 'jc/pack-peeled'
4266
5970
git-merge: tighten error checking.
4267
5971
git-merge: do not leak rev-parse output used for checking internally.
4268
Merge branch 'jc/merge'
4269
Merge branch 'jc/push-delete-ref'
4270
Merge branch 'js/shortlog'
4271
5972
cvsimport: style fixup.
4272
Merge branch 'maint'
4273
Merge branch 'jc/globfetch'
4274
Merge branch 'maint'
4275
Merge master.kernel.org:/pub/scm/gitk/gitk
4276
5973
git-merge: fix confusion between tag and branch
4277
Merge branch 'maint'
4278
5974
xmerge: make return value from xdl_merge() more usable.
4279
5975
merge-recursive: use xdl_merge().
4280
Merge branch 'maint'
4281
5976
read-tree: further loosen "working file will be lost" check.
4282
5977
Loosen "working file will be lost" check in Porcelain-ish
4283
5978
read-tree: document --exclude-per-directory
4284
Merge branch 'maint'
4285
Merge
4286
5979
git-merge: squelch needless error message.
4287
5980
git-merge: fix "fix confusion between tag and branch" for real
4288
Merge branch 'maint'
4289
5981
Fix perl/ build.
4290
5982
git-rerere: add 'gc' command.
4291
5983
Documentation/git-commit: rewrite to make it more end-user friendly.
4292
5984
git-commit: allow --only to lose what was staged earlier.
4293
Merge branch 'maint'
4294
5985
shortlog: remove "[PATCH]" prefix from shortlog output
4295
5986
shortlog: fix segfault on empty authorname
4296
5987
diff --numstat: show binary with '-' to match "apply --numstat"
4297
5988
add test case for recursive merge
4298
Merge branch 'maint'
4299
Merge branch 'master' into js/merge
4300
5989
git-push: document removal of remote ref with :<dst> pathspec
4301
Merge branch 'maint'
4302
5990
Revert "git-diff: Introduce --index and deprecate --cached."
4303
5991
git merge: reword failure message.
4304
5992
spurious .sp in manpages
4305
5993
git-push: accept tag <tag> as advertised.
4306
5994
send-pack: tighten checks for remote names
4307
Merge branch 'js/merge'
4308
5995
branch --color: change default color selection.
4309
Merge branch 'ap/branch'
4310
Merge branch 'rr/cvsexportcommit'
4311
Merge branch 'jc/numstat'
4312
Merge branch 'ap/clone-origin'
4313
Merge branch 'jc/commit-careful'
4314
Merge branch 'lh/branch-rename'
4315
Merge branch 'np/addcommit'
4316
Merge branch 'ew/rerere'
4317
Merge branch 'jc/read-tree-ignore'
4318
5996
git-blame: show lines attributed to boundary commits differently.
4319
5997
config documentation: group color items together.
4320
5998
git-svn: allow both diff.color and color.diff
4321
Merge branch 'jc/diff--cached'
4322
5999
Update git-diff documentation
4323
Merge branch 'maint'
4324
6000
git-fetch: make it work from within a subdirectory.
4325
6001
git-reset: make it work from within a subdirectory.
4326
6002
git-reset [--mixed] <tree> [--] <paths>...
4327
Merge branch 'js/show'
4328
6003
merge: give a bit prettier merge message to "merge branch~$n"
4329
6004
git-clone: use wildcard specification for tracking branches
4330
6005
git-pull: refuse default merge without branch.*.merge
4341
6016
Teach show-branch how to show ref-log data.
4342
6017
git-fetch: Avoid reading packed refs over and over again
4343
6018
avoid accessing _all_ loose refs in git-show-ref --verify
4344
Merge branch 'jn/web' (early part)
4345
Merge branch 'js/branch-config'
4346
Merge branch 'jc/reflog' (early part)
4347
Merge branch 'jc/blame-boundary'
4348
6019
show-ref: fix --quiet --verify
4349
6020
show-ref: fix --verify --hash=length
4350
6021
parse-remote::expand_refs_wildcard()
4357
6028
git-add --interactive
4358
6029
git-add --interactive: hunk splitting
4359
6030
Revert "fix testsuite: make sure they use templates freshly built from the source"
4360
Merge branch 'jc/test-clone' into jc/clone
4361
6031
Do not create $GIT_DIR/remotes/ directory anymore.
4362
6032
Use preprocessor constants for environment variable names.
4363
6033
Revert "Make left-right automatic."
4364
6034
fix populate-filespec
4365
6035
config_rename_section: fix FILE* leak
4366
6036
simplify inclusion of system header files.
4367
Merge branch 'maint'
4368
6037
revision: --skip=<n>
4369
6038
git-add: error out when given no arguments.
4370
6039
compat/inet_ntop: do not use u_int
4371
Merge branch 'jc/clone'
4372
Merge branch 'jc/branch-remove-remote'
4373
Merge branch 'jc/blame'
4374
Merge branch 'jc/leftright'
4375
6040
diff documentation: mostly talk about <commit>
4376
Merge branch 'ew/svn-pm'
4377
6041
Revert "git-pull: refuse default merge without branch.*.merge"
4378
Merge branch 'maint'
4379
6042
parse-remote: mark all refs not for merge only when fetching more than one
4380
6043
_XOPEN_SOURCE problem also exists on FreeBSD
4381
6044
commit-tree: do not overflow MAXPARENT
4384
6047
Do not support "partial URL shorthand" anymore.
4385
6048
Really fix headers for __FreeBSD__
4386
6049
git-tag: lose exit after die
4387
Merge branch 'js/rerere'
4388
Merge branch 'sb/merge-friendly'
4389
6050
Allow branch.*.merge to talk about remote tracking branches.
4390
6051
git-add --interactive: add documentation
4391
Merge branch 'jc/git-add--interactive'
4392
Merge branch 'jc/skip-count'
4393
6052
match_pathspec() -- return how well the spec matched
4394
6053
git-rm: update to saner semantics
4395
6054
t3600: update the test for updated git rm
4398
6057
git-add: add ignored files when asked explicitly.
4399
6058
git-add: warn when adding an ignored file with an explicit request.
4400
6059
git-add -f: allow adding otherwise ignored files.
4401
Merge branch 'rf/web'
4402
Merge branch 'jc/bm'
4403
6060
GIT v1.5.0 preview
4404
6061
4405
6062
Lars Hjemli (4):
4639
6296
Jonas Fonseca (1):
4640
6297
git-update-index(1): fix use of quoting in section title
4641
6298
4642
Junio C Hamano (2):
4643
Merge branch 'maint'
6299
Junio C Hamano (1):
4644
6300
GIT 1.4.4
4645
6301
4646
6302
Robin Rosenberg (1):
4660
6316
gitweb: Use character or octal escape codes (and add span.cntrl) in esc_path
4661
6317
gitweb: New improved patchset view
4662
6318
4663
Junio C Hamano (19):
6319
Junio C Hamano (14):
4664
6320
gitweb: fix disabling of "forks"
4665
6321
gitweb: minimally fix "fork" support.
4666
6322
gitweb: do not give blame link unconditionally in diff-tree view
4667
6323
git-status: quote LF in its output
4668
Merge git://git.kernel.org/pub/scm/gitk/gitk
4669
6324
git-pickaxe: retire pickaxe
4670
6325
gitweb: protect blob and diff output lines from controls.
4671
6326
gitweb: protect commit messages from controls.
4672
6327
gitweb: fix unmatched div in commitdiff
4673
Merge branch 'maint'
4674
6328
Documentation: move blame examples
4675
Merge branch 'maint'
4676
6329
git-annotate: no need to exec blame; it is built-in now.
4677
6330
git-annotate: fix -S on graft file with comments.
4678
6331
path-list: fix path-list-insert return value
4679
Merge branch 'maint'
4680
6332
git-cvsserver: read from git with -z to get non-ASCII pathnames.
4681
Merge branch 'maint'
4682
6333
GIT 1.4.4-rc2
4683
6334
4684
6335
OGAWA Hirofumi (1):
4778
6429
Jonas Fonseca (1):
4779
6430
Add man page for git-show-ref
4780
6431
4781
Junio C Hamano (153):
6432
Junio C Hamano (96):
4782
6433
Add git-for-each-ref: helper for language bindings
4783
6434
Fix t1400-update-ref test minimally
4784
6435
fsck-objects: adjust to resolve_ref() clean-up.
4787
6438
Tell between packed, unpacked and symbolic refs.
4788
6439
pack-refs: do not pack symbolic refs.
4789
6440
git-pack-refs --prune
4790
Merge branch 'lt/refs' into jc/for-each-ref-with-lt-refs
4791
Merge branch 'lt/refs' into jc/lt-ref2-with-lt-refs
4792
6441
pack-refs: fix git_path() usage.
4793
6442
lock_ref_sha1_basic: remove unused parameter "plen".
4794
Merge branch 'jc/for-each-ref-with-lt-refs' into jc/ref-locking
4795
Merge branch 'jc/lt-ref2-with-lt-refs' into jc/ref-locking
4796
6443
Clean-up lock-ref implementation
4797
6444
update-ref: -d flag and ref creation safety.
4798
6445
update a few Porcelain-ish for ref lock safety.
4799
6446
Teach receive-pack about ref-log
4800
6447
receive-pack: call setup_ident before git_config
4801
Merge branch 'jc/for-each-ref' into jc/ref-locking
4802
Merge branch 'master' into lj/refs
4803
6448
grep --all-match
4804
6449
teach revision walker about --all-match.
4805
6450
git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1)
4810
6455
delete_ref(): delete packed ref
4811
6456
git-branch: remove D/F check done by hand.
4812
6457
show-ref --hash=len, --abbrev=len, and --abbrev
4813
Merge branch 'sb/fetch' into jc/refs-and-fetch
4814
6458
git-fetch: adjust to packed-refs.
4815
6459
Fix refs.c;:repack_without_ref() clean-up path
4816
Merge branch 'master' into lj/refs
4817
6460
gitweb: make leftmost column of blame less cluttered.
4818
6461
git-fetch: do not look into $GIT_DIR/refs to see if a tag exists.
4819
6462
pack-refs: use lockfile as everybody else does.
4828
6471
ref-log: allow ref@{count} syntax.
4829
6472
git-send-email: real name with period need to be dq-quoted on From: line
4830
6473
git-blame --porcelain
4831
Merge branch 'jc/blame' into jc/web-blame
4832
6474
gitweb: use blame --porcelain
4833
6475
Make git-send-email detect mbox-style patches more readily
4834
6476
core.logallrefupdates create new log file only for branch heads.
4836
6478
core.logallrefupdates thinko-fix
4837
6479
pack-objects: document --delta-base-offset option
4838
6480
blame: Document and add help text for -f, -n, and -p
4839
Merge branch 'jc/blame' into jc/web-blame
4840
6481
gitweb: spell "blame --porcelain" with -p
4841
6482
git-repack: repo.usedeltabaseoffset
4842
6483
diff --numstat
4843
6484
gitweb: use for-each-ref to show the latest activity across branches
4844
Merge branch 'rs/zip'
4845
Merge branch 'sk/svn'
4846
Merge branch 'sb/fetch'
4847
Merge branch 'rs/rebase'
4848
Merge branch 'mw/send-email'
4849
Merge branch 'pb/bisect'
4850
Merge branch 'jc/diff-numstat'
4851
Merge early part of branch 'jc/diff-apply-patch'
4852
Merge branch 'jc/grep'
4853
Merge branch 'jc/send-email'
4854
Merge branch 'js/diff'
4855
Merge branch 'mw/pathinfo'
4856
6485
ref-log: fix D/F conflict coming from deleted refs.
4857
Merge branch 'maint'
4858
6486
git-pickaxe: blame rewritten.
4859
6487
git-pickaxe -M: blame line movements within a file.
4860
6488
git-pickaxe -C: blame cut-and-pasted lines.
4861
Merge branch 'maint'
4862
6489
git-pickaxe: pagenate output by default.
4863
6490
git-pickaxe: fix nth_line()
4864
6491
git-pickaxe: improve "best match" heuristics
4867
6494
git-pickaxe: do not confuse two origins that are the same.
4868
6495
git-pickaxe: get rid of wasteful find_origin().
4869
6496
git-pickaxe: swap comparison loop used for -C
4870
Merge branch 'maint'
4871
Merge branch 'np/pack'
4872
Merge branch 'maint'
4873
Merge branch 'master' into jc/web
4874
6497
sha1_name.c: avoid compilation warnings.
4875
6498
t3200: git-branch testsuite update
4876
Merge branch 'maint'
4877
Merge branch 'jc/web-blame'
4878
Merge for-each-ref to sync gitweb fully with 'next'
4879
Merge branch 'jc/web'
4880
Merge branch 'aw/cvsimport'
4881
Merge branch 'maint'
4882
Merge branch 'jc/combined'
4883
Merge branch 'jc/combined'
4884
Merge branch 'jc/reflog' into lj/refs
4885
Merge branch 'maint'
4886
6499
tests: merge-recursive is usable without Python
4887
6500
merge: loosen overcautious "working file will be lost" check.
4888
6501
merge-recursive: use abbreviated commit object name.
4891
6504
t6022: ignoring untracked files by merge-recursive when they do not matter
4892
6505
Documentation: fix git-format-patch mark-up and link it from git.txt
4893
6506
send-pack --keep: do not explode into loose objects on the receiving end.
4894
Merge early part of branch 'np/index-pack' into sp/keep-pack
4895
6507
git-pickaxe: WIP to refcount origin structure.
4896
6508
git-pickaxe: allow -Ln,m as well as -L n,m
4897
6509
git-pickaxe: refcount origin correctly in find_copy_in_parent()
4898
6510
git-pickaxe: tighten sanity checks.
4899
6511
Revert "send-pack --keep: do not explode into loose objects on the receiving end."
4900
6512
git-pickaxe: split find_origin() into find_rename() and find_origin().
4901
Merge branch 'maint'
4902
6513
git-pickaxe: cache one already found path per commit.
4903
6514
Introduce a new revision set operator <rev>^!
4904
Merge branch 'lj/refs'
4905
Merge branch 'jc/refs-and-fetch'
4906
Merge branch 'rs/cherry'
4907
6515
branch: work in subdirectories.
4908
Merge branch 'maint'
4909
6516
for-each-ref: "creator" and "creatordate" fields
4910
Merge branch 'maint'
4911
Merge branch 'sp/keep-pack' into np/index-pack
4912
Merge branch 'master' into np/index-pack
4913
Merge branch 'maint'
4914
6517
git-pickaxe: rename detection optimization
4915
6518
git-pickaxe: simplify Octopus merges further
4916
6519
git-pickaxe: re-scan the blob after making progress with -M
4917
6520
git-pickaxe: re-scan the blob after making progress with -C
4918
Merge branch 'pb/web'
4919
Merge branch 'lt/push-config'
4920
Merge branch 'np/verbose-push'
4921
6521
git-pickaxe: fix origin refcounting
4922
Merge branch 'maint'
4923
6522
cherry is built-in, do not ship git-cherry.sh
4924
6523
git-blame: add internal statistics to count read blobs.
4925
6524
git-pickaxe: optimize by avoiding repeated read_sha1_file().
4926
6525
Document git-pack-refs and link it to git(7).
4927
6526
git-pickaxe: -L /regexp/,/regexp/
4928
Merge branch 'maint'
4929
Merge branch 'np/index-pack'
4930
Merge branch 'jc/read-tree'
4931
6527
git-pickaxe: allow "-L <something>,+N"
4932
Merge branch 'jc/pickaxe'
4933
Merge branch 'maint'
4934
6528
GIT 1.4.3-rc1
4935
6529
4936
6530
Karl Hasselström (1):
5114
6708
Johannes Schindelin (1):
5115
6709
link_temp_to_file: call adjust_shared_perm() only when we created the directory
5116
6710
5117
Junio C Hamano (10):
6711
Junio C Hamano (9):
5118
6712
Documentation: clarify refname disambiguation rules.
5119
6713
combine-diff: a few more finishing touches.
5120
6714
combine-diff: fix hunk_comment_line logic.
5121
6715
combine-diff: honour --no-commit-id
5122
Merge branch 'jc/combined' into maint
5123
6716
Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"
5124
6717
quote.c: ensure the same quoting across platforms.
5125
6718
revision traversal: --unpacked does not limit commit list anymore.
5224
6817
Andy Whitcroft (1):
5225
6818
add proper dependancies on the xdiff source
5226
6819
5227
Junio C Hamano (2):
6820
Junio C Hamano (1):
5228
6821
Revert "move pack creation to version 3"
5229
Merge branch 'maint'
5230
6822
5231
6823
Linus Torvalds (1):
5232
6824
Fix hash function in xdiff library
5263
6855
cvsserver: Show correct letters for modified, removed and added files
5264
6856
cvsserver: fix "cvs diff" in a subdirectory
5265
6857
5266
Junio C Hamano (7):
6858
Junio C Hamano (6):
5267
6859
Add WEBDAV timeout to http-fetch.
5268
6860
git-fetch --update-head-ok typofix
5269
6861
git-pull: we say commit X, not X commit.
5270
6862
git.spec.in: perl subpackage is installed in perl_vendorlib not vendorarch
5271
6863
apply --numstat -z: line termination fix.
5272
6864
t4015: work-around here document problem on Cygwin.
5273
Merge branch 'jc/http'
5274
6865
5275
6866
Martin Waitz (1):
5276
6867
paginate git-diff by default
5308
6899
Jakub Narebski (1):
5309
6900
gitweb: Cleanup Git logo and Git logo target generation
5310
6901
5311
Junio C Hamano (10):
6902
Junio C Hamano (9):
5312
6903
Makefile: install and clean merge-recur, still.
5313
6904
git-mv: invalidate the removed path properly in cache-tree
5314
6905
git-push: .git/remotes/ file does not require SP after colon
5315
Merge branch 'maint'
5316
6906
escape tilde in Documentation/git-rev-parse.txt
5317
6907
tar-tree deprecation: we eat our own dog food.
5318
6908
gitweb: Make the Git logo link target to point to the homepage
5657
7247
Fix trivial typos and inconsistencies in hooks documentation
5658
7248
gitk(1): mention --all
5659
7249
5660
Junio C Hamano (191):
7250
Junio C Hamano (125):
5661
7251
Perl interface: add build-time configuration to allow building with -fPIC
5662
7252
Perl interface: make testsuite work again.
5663
7253
perl: fix make clean
5672
7262
upload-pack: use object pointer not copy of sha1 to keep track of has/needs.
5673
7263
upload-pack: lift MAX_NEEDS and MAX_HAS limitation
5674
7264
recur vs recursive: help testing without touching too many stuff.
5675
Merge branch 'lt/unitype' into js/c-merge-recursive
5676
7265
sha1_file.c: expose map_sha1_file() interface.
5677
7266
pack-objects: reuse deflated data from new-style loose objects.
5678
7267
unpack-objects: read configuration data upon startup.
5679
7268
Makefile: git-merge-recur depends on xdiff libraries.
5680
Merge branch 'js/read-tree' into js/c-merge-recursive
5681
7269
gitweb: There can be more than two levels of subdirectories
5682
7270
gitweb: an obvious cut and paste error.
5683
7271
gitweb: fix use of uninitialized value.
5693
7281
autoconf: fix NEEDS_SSL_WITH_CRYPTO
5694
7282
autoconf: NO_IPV6
5695
7283
Racy git: avoid having to be always too careful
5696
Merge branch 'master' into pb/gitpm
5697
Merge branch 'master' into mk/rename
5698
7284
read-cache: tweak racy-git delay logic
5699
7285
autoconf: clean temporary file mak.append
5700
Merge branch 'master' into mk/rename
5701
7286
git-grep: show pathnames relative to the current directory
5702
Merge branch 'master' into js/c-merge-recursive
5703
Merge branch 'ml/pager'
5704
Merge branch 'mk/rename'
5705
Merge branch 'jc/grep'
5706
Merge branch 'jn/conf'
5707
Merge branch 'lt/web'
5708
Merge branch 'jn/web'
5709
Merge branch 'js/color-diff'
5710
Merge branch 'js/http-mb'
5711
Merge branch 'js/read-tree'
5712
Merge branch 'jc/pack-objects'
5713
Merge branch 'th/diff-extra'
5714
Merge branch 'jc/racy-delay'
5715
Merge branch 'jc/upload-pack'
5716
7287
upload-pack: minor clean-up in multi-ack logic
5717
7288
Fix type of combine-diff.c::show_patch_diff()
5718
Merge branch 'maint'
5719
7289
Remove combine-diff.c::uninteresting()
5720
7290
t4116 apply --reverse test
5721
7291
git-apply --reverse: simplify reverse option.
5722
7292
git-apply --binary: clean up and prepare for --reverse
5723
Merge branch 'master' into pb/gitpm
5724
7293
avoid nanosleep(2)
5725
Merge branch 'maint'
5726
7294
Documentation/technical/racy-git.txt
5727
7295
Add check program "git-check-racy"
5728
7296
Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
5729
7297
builtin-grep: remove unused debugging cruft.
5730
Merge branch 'maint'
5731
Merge branch 'jc/racy'
5732
Merge branch 'jc/format-patch'
5733
7298
builtin-apply --reverse: two bugfixes.
5734
7299
diff.c: make binary patch reversible.
5735
7300
apply --reverse: tie it all together.
5736
7301
git-apply --reject
5737
7302
git-apply --reject: send rejects to .rej files.
5738
7303
git-apply --verbose
5739
Merge branch 'maint'
5740
7304
apply --reject: count hunks starting from 1, not 0
5741
7305
Convert memset(hash,0,20) to hashclr(hash).
5742
Merge branch 'gl/cleanup' into gl/cleanup-next
5743
7306
hashcpy/hashcmp remaining bits.
5744
7307
builtin-grep.c: remove unused debugging piece.
5745
7308
update-index -g
5746
Merge branch 'gl/cleanup'
5747
Merge branch 'master' into gl/web
5748
7309
git-apply --reject: finishing touches.
5749
Merge branch 'jc/apply'
5750
Merge branch 'ts/daemon'
5751
Merge branch 'js/c-merge-recursive'
5752
Merge branch 'gl/cleanup-next'
5753
7310
free(NULL) is perfectly valid.
5754
7311
daemon: prepare for multiple services.
5755
7312
daemon: add upload-tar service.
5756
7313
multi-service daemon: documentation
5757
Merge branch 'gl/web'
5758
Merge early part of branch 'jc/daemon'
5759
7314
t5710: fix two thinkos.
5760
7315
Constness tightening for move/link_temp_to_file()
5761
Merge git://git.kernel.org/pub/scm/gitk/gitk
5762
7316
consolidate two copies of new style object header parsing code.
5763
7317
pack-objects: re-validate data we copy from elsewhere.
5764
Merge branch 'master' into cc/trace
5765
7318
Revert "Convert git-annotate to use Git.pm"
5766
7319
Revert "Git.pm: Introduce fast get_object() method"
5767
7320
Revert "Make it possible to set up libgit directly (instead of from the environment)"
5768
7321
pack-objects: fix thinko in revalidate code
5769
7322
more lightweight revalidation while reusing deflated stream in packing
5770
7323
unpack-objects desperately salvages objects from a corrupt pack
5771
Merge branch 'jc/pack'
5772
7324
revision.c: allow injecting revision parameters after setup_revisions().
5773
7325
Teach rev-list an option to read revs from the standard input.
5774
Merge branch 'pm/diff'
5775
7326
Revert "daemon: add upload-tar service."
5776
Merge branch 'jc/daemon'
5777
7327
Make apply --binary a no-op.
5778
7328
diff --binary generates full index on binary files.
5779
7329
Separate object listing routines out of rev-list
5788
7338
Add --verbose to git-archive
5789
7339
Teach --exec to git-archive --remote
5790
7340
Prepare larger packet buffer for upload-pack protocol.
5791
Merge branch 'jc/sideband' into jc/archive
5792
7341
Add sideband status report to git-archive protocol
5793
7342
upload-archive: monitor child communication more carefully.
5794
7343
builtin-archive.c: rename remote_request() to extract_remote_arg()
5795
7344
pack-objects: document --revs, --unpacked and --all.
5796
7345
http-fetch: fix alternates handling.
5797
Merge branch 'aw/send-pack'
5798
Merge branch 'jc/binary'
5799
7346
unpack-objects -r: call it "recover".
5800
Merge branch 'jc/unpack'
5801
Merge branches 'maint' and 'jc/http'
5802
7347
Document git-grep -[Hh]
5803
7348
Define fallback PATH_MAX on systems that do not define one in <limits.h>
5804
7349
Fix git-am safety checks
5806
7351
Add ftp:// protocol support for git-http-fetch
5807
7352
t1400: make test debuggable.
5808
7353
apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches
5809
Merge branch 'jc/archive'
5810
Merge branch 'jk/diff'
5811
Merge branch 'jc/am'
5812
Merge branch 'jc/pack'
5813
Merge part of branch 'jc/upload-pack'
5814
Merge branch 'sk/ftp'
5815
7354
builtin-grep: make pieces of it available as library.
5816
7355
revision traversal: prepare for commit log match.
5817
7356
revision traversal: --author, --committer, and --grep.
5823
7362
diff.c: second war on whitespace.
5824
7363
git-apply: second war on whitespace.
5825
7364
Add t5510 to test per branch configuration affecting git-fetch.
5826
Merge branch 'jl/daemon'
5827
Merge branch 'sb/branch-attributes'
5828
Merge branch 'jc/filter-commit'
5829
7365
Remove upload-tar and make git-tar-tree a thin wrapper to git-archive
5830
Merge early parts of branch 'np/pack'
5831
Merge branch 'sk/svnimport'
5832
7366
Deprecate merge-recursive.py
5833
7367
diff --stat: allow custom diffstat output width.
5834
7368
diff --stat: color output.
5835
7369
An illustration of rev-list --parents --pretty=raw
5836
7370
grep: free expressions and patterns when done.
5837
7371
grep: fix --fixed-strings combined with expression.
5838
Merge branch 'jc/deprecate-recursive'
5839
Merge branch 'jc/repack'
5840
Merge branch 'jc/whitespace'
5841
Merge branch 'sp/void'
5842
Merge branch 'cc/branch-test'
5843
Merge branch 'jl/virtual'
5844
7372
Contributed bash completion support for core Git tools.
5845
7373
git-diff -B output fix.
5846
7374
Remove -fPIC which was only needed for Git.xs
5847
Merge branch 'lt/web'
5848
Merge branch 'jc/diff-stat'
5849
Merge branch 'jc/gitpm'
5850
Merge branch 'maint'
5851
7375
GIT 1.4.3-rc1
5852
7376
5853
7377
Linus Torvalds (10):
6127
7651
git-svn: bugfix: allow SVN:: lib users to track the root of the repository
6128
7652
git-svn: split the path from the url correctly with limited perms
6129
7653
6130
Junio C Hamano (12):
7654
Junio C Hamano (8):
6131
7655
git-apply: applying a patch to make a symlink shorter.
6132
7656
combine-diff: use color
6133
7657
Fix git-diff A...B
6134
7658
builtin-apply: remove unused increment
6135
Merge branch 'rn/push-dav'
6136
7659
git-sh-setup: do not use repo-config to test the git directory
6137
Merge branch 'rj/header'
6138
7660
git-am: give better diagnostics when the patch does not apply during --3way
6139
7661
Better error message when we are unable to lock the index file
6140
7662
t/t4013: fix futzing with the version string.
6141
Merge git://git.kernel.org/pub/scm/gitk/gitk
6142
GIT 1.4.2
6143
7663
6144
7664
Matthias Lederhofer (1):
6145
7665
upload-pack: fix timeout in create_pack_file
6179
7699
Jonas Fonseca (1):
6180
7700
Update git-init-db(1) and documentation of core.sharedRepository
6181
7701
6182
Junio C Hamano (14):
7702
Junio C Hamano (13):
6183
7703
Cygwin needs NO_C99_FORMAT???
6184
7704
Further clean-up: usage() vs die()
6185
Merge branch 'jc/c99'
6186
7705
Makefile: Cygwin does not seem to need NO_STRLCPY
6187
7706
Fix "grep -w"
6188
7707
debugging: XMALLOC_POISON
6261
7780
Josef Weidendorfer (1):
6262
7781
Extend testing git-mv for renaming of subdirectories
6263
7782
6264
Junio C Hamano (33):
7783
Junio C Hamano (18):
6265
7784
git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"
6266
7785
t4112: simplify the test and remove unneeded working tree file.
6267
Merge branch 'pb/configure'
6268
7786
lost-found: use fsck-objects --full
6269
7787
git-reset: detect update-ref error and report it.
6270
7788
log and diff family: honor config even from subdirectories
6271
7789
git-apply -R: binary patches are irreversible for now.
6272
7790
t4103: fix binary patch application test.
6273
Merge branch 'jc/diff'
6274
Merge branch 'js/alias-p'
6275
Merge branch 'js/cvs'
6276
Merge branch 'lt/web'
6277
Merge branch 'pb/multi-fetch'
6278
Merge branch 'lt/setup' into __/setup-n-mv
6279
Merge branch 'jn/make'
6280
Merge branch 'js/mv'
6281
Merge branch '__/setup-n-mv'
6282
Merge branch 'lt/web'
6283
7791
git-checkout: allow "checkout HEAD -- path"
6284
7792
Builtins: control the use of pager from the command table.
6285
Merge branch 'jc/checkout'
6286
Merge branch 'ml/pager'
6287
Merge branch 'rs/rebase'
6288
7793
fetch/clone: mark messages from remote side stand out.
6289
7794
Fix "git diff blob1 blob2" showing the diff in reverse.
6290
7795
read-tree: shadowed variable fix.
6292
7797
diff.c: do not use pathname comparison to tell renames
6293
7798
Show both blob names from "git diff blob1 blob2"
6294
7799
sideband: do not use color, just say "remote:"
6295
Merge branch 'jc/sideband'
6296
7800
Documentation/git.txt: link git-svn and git-instaweb from the main page.
6297
7801
GIT 1.4.2-rc3
6298
7802
6394
7898
Add option to enable threading headers
6395
7899
Add option to set initial In-Reply-To/References
6396
7900
6397
Junio C Hamano (13):
7901
Junio C Hamano (8):
6398
7902
fetch/clone: check return status from ls-remote
6399
7903
builtin-log: typefix for recent format-patch changes.
6400
7904
checkout -f failed to check out a file if an existing directory interfered.
6403
7907
apply: handle type-changing patch correctly.
6404
7908
git-fetch: fix --keep vs --thin
6405
7909
unpack-objects: remove stale and confusing comment
6406
Merge branch 'lt/objformat'
6407
Merge branch 'jc/read-tree'
6408
Merge branch 'ew/apply'
6409
Merge branch 'jt/format-patch'
6410
Merge branch 'jc/clone-bind-failure'
6411
7910
6412
7911
Linus Torvalds (1):
6413
7912
sha1_file: add the ability to parse objects in "pack file format"
6493
7992
Jonas Fonseca (1):
6494
7993
Documentation/urls.txt: Use substitution to escape square brackets
6495
7994
6496
Junio C Hamano (79):
7995
Junio C Hamano (49):
6497
7996
Makefile: add framework to verify and bench sha1 implementations.
6498
7997
test-sha1: test hashing large buffer
6499
7998
t4013: add tests for diff/log family output options.
6500
7999
t4013: add more tests around -c and --cc
6501
Merge branch 'jc/diff-test' into th/diff
6502
8000
Fix some more diff options changes.
6503
8001
t4013 test updates for new output code.
6504
8002
combine-diff.c: type sanity.
6505
Merge branch 'jc/diff-test-updates' into th/diff
6506
8003
format-patch: fix diff format option implementation
6507
8004
t4013: add format-patch tests.
6508
Merge branch 'jc/diff-test' into th/diff
6509
Merge branch 'jc/diff-test' into jc/diff-test-updates
6510
8005
t4013: note improvements brought by the new output code.
6511
Merge branch 'jc/diff-test-updates' into th/diff
6512
8006
gitweb: optimize per-file history generation
6513
8007
gitweb: optimize per-file history generation
6514
8008
t4013: add "diff" UI program tests.
6516
8010
commit.c: do not redefine UNINTERESTING bit.
6517
8011
get_merge_bases: clean up even when there is no common commit.
6518
8012
revert clear-commit-marks for now.
6519
Merge branch 'master' into js/merge-base
6520
8013
boolean: accept yes and no as well
6521
8014
send-email: do not barf when Term::ReadLine does not like your terminal
6522
8015
t6200: fmt-merge-msg test.
6524
8017
git-grep: fix exit code when we use external grep.
6525
8018
git-grep: use a bit more specific error messages.
6526
8019
Re-fix clear_commit_marks().
6527
Merge branch 'js/fmt-merge-msg'
6528
Merge branch 'jc/grepfix'
6529
Merge branch 'th/diff'
6530
Merge branch 'jc/diff-test'
6531
Merge branch 'jc/sha1'
6532
Merge branch 'jc/fmt-merge-msg-test'
6533
Merge branch 'lt/gitweb'
6534
8020
git-grep: boolean expression on pattern matching.
6535
8021
git-reset: complain and exit upon seeing an unknown parameter.
6536
8022
mailinfo: assume input is latin-1 on the header as we do for the body
6537
Merge branch 'ew/instaweb'
6538
8023
diffcore-rename: try matching up renames without populating filespec first.
6539
8024
builtin-rev-parse.c: constness tightening
6540
Merge branch 'js/merge-base'
6541
8025
show-branch: match documentation and usage
6542
8026
rev-parse documentation: talk about range notation.
6543
8027
git-svn: migrate out of contrib (follow-up)
6546
8030
git log -p --merge [[--] paths...]
6547
8031
colored diff: diff.color = auto fix
6548
8032
diff: do not use configuration magic at the core-level
6549
Merge branch 'sf/diff'
6550
8033
"git -p cmd" to page anywhere
6551
8034
merge-base: update the clean-up postprocessing
6552
Merge branch 'ew/svn'
6553
Merge branch 'ew/diff'
6554
Merge branch 'jc/mailinfo'
6555
Merge branch 'jc/grep'
6556
Merge branch 'jc/rename'
6557
Merge branch 'lt/gitweb'
6558
Merge branch 'jc/show-merge'
6559
8035
fmt-merge-msg fix
6560
Merge branch 'lt/merge-tree'
6561
Merge branch 'lt/prune'
6562
Merge branch 'js/merge-base'
6563
8036
Fix grammatical error in git-revert
6564
8037
git-repack: avoid redirecting stderr into git-pack-objects
6565
8038
test-lib: unset GIT_TRACE
6566
Merge branch 'ml/trace'
6567
8039
t4013 diff format tests update
6568
8040
Adjust t4013 tests to corrected format-patch.
6569
8041
Documentation: Fix ssh://[user@]host.xz URL
6570
8042
builtin-prune.c: forgot TYPE => OBJ changes.
6571
Merge branch 'sp/lazy-mkdir'
6572
Merge branch 'lt/unitype'
6573
8043
Documentation/Makefile: product depends on asciidoc.conf
6574
8044
show-branch: fix performance problem.
6575
Merge branch 'sp/reflog'
6576
8045
6577
8046
Linus Torvalds (7):
6578
8047
xdiff: generate "anti-diffs" aka what is common to two files
6709
8178
t4014: fix for whitespace from "wc -l"
6710
8179
format-patch: use clear_commit_marks() instead of some ad-hockery
6711
8180
6712
Junio C Hamano (9):
8181
Junio C Hamano (6):
6713
8182
git-repack: Be careful when updating the same pack as an existing one.
6714
8183
t4014: add format-patch --ignore-if-in-upstream test
6715
8184
t4014: fix test commit labels.
6716
8185
diff.c: fix get_patch_id()
6717
Merge branch 'js/patch'
6718
Merge branch 'jc/repack'
6719
8186
Racy GIT (part #3)
6720
Merge branch 'jc/test-3402'
6721
8187
upload-pack.c: <sys/poll.h> includes <ctype.h> on OpenBSD 3.8
6722
8188
6723
8189
Linus Torvalds (4):
6771
8237
apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.
6772
8238
Save errno in handle_alias()
6773
8239
6774
Junio C Hamano (18):
8240
Junio C Hamano (12):
6775
8241
Makefile: do not recompile main programs when libraries have changed.
6776
8242
usage: minimum type fix.
6777
Merge branch 'pb/error'
6778
8243
git-pull: abort when fmt-merge-msg fails.
6779
8244
git-merge --squash
6780
8245
diff --color: use reset sequence when we mean reset.
6781
8246
repo-config: fix printing of bool
6782
8247
diff --color: use $GIT_DIR/config
6783
Merge branch 'ew/rebase'
6784
Merge branch 'js/diff'
6785
Merge branch 'ml/cvsimport'
6786
Merge branch 'jc/diff'
6787
Merge branch 'jc/squash'
6788
8248
combine-diff.c: type sanity
6789
8249
connect.c: remove unused parameters from tcp_connect and proxy_connect
6790
8250
connect.c: check the commit buffer boundary while parsing.
6909
8369
repo-config: Fix late-night bug
6910
8370
git_config: access() returns 0 on success, not > 0
6911
8371
6912
Junio C Hamano (275):
6913
Merge branch 'js/diffstat' into next
6914
Merge branch 'master' into next
6915
Merge branch 'js/diffstat' into next
6916
Merge branch 'jc/fix5500' into next
6917
Merge branch 'jc/bottomless' into next
6918
Merge branch 'lt/logopt' into next
6919
Merge branch 'master' into next
8372
Junio C Hamano (31):
6920
8373
Revert all the rev-list option parsing changes.
6921
Merge branch 'jc/logopt' into next
6922
8374
Clean-up Geert's similarity fingerprint code.
6923
Merge branch 'jc/simpack' into next
6924
8375
Extract "log [diff options]" parser out.
6925
Merge branch 'jc/logopt' into next
6926
8376
whatchanged options parser fix.
6927
8377
Built-in git-whatchanged
6928
Merge branch 'jc/logopt' into next
6929
Merge branch 'lt/show' into next
6930
Merge branch 'js/diffstat' into next
6931
Merge branch 'lt/logopt' into next
6932
Merge branch 'jc/pager-cat' into next
6933
Merge branch 'lt/logopt' into next
6934
Merge branch 'lt/logopt' into next
6935
Merge branch 'master' into next
6936
8378
Geert's similarity
6937
8379
Try using Geert similarity code in pack-objects.
6938
Merge branch 'jc/boundary' into next
6939
Merge branch 'master' into next
6940
Merge branch 'lt/logopt' into next
6941
Merge branch 'lt/logopt' into next
6942
Merge branch 'master' into next
6943
Merge branch 'sh/daemon' into next
6944
Merge branch 'jc/fmt-patch' into next
6945
Merge branch 'lt/xsha1' into next
6946
Merge branch 'master' into next
6947
Merge branch 'jc/unresolve' into next
6948
Merge branch 'jc/fmt-patch' into next
6949
Merge branch 'jc/diff' into next
6950
Merge branch 'jc/unresolve' into next
6951
Stop carrying Geert's similarity estimator.
6952
Merge branch 'master' into next
6953
Merge branch 'jc/fmt-patch' into next
6954
Merge branch 'master' into next
6955
Merge branch 'jc/fmt-patch' into next
6956
Merge branch 'jc/color' into next
6957
Merge branch 'jc/cc-stat' into next
6958
Merge branch 'jc/fmt-patch' into next
6959
Merge branch 'jc/diff' into next
6960
Merge branch 'jc/diff' into next
6961
Merge branch 'ar/chmod-series' into next
6962
Merge part of 'jc/cache-tree'
6963
Merge branch 'master' into next
6964
Merge branch 'jc/cache-tree' into next
6965
Merge branch 'np/delta' into next
6966
Merge branch 'pb/config' into next
6967
Merge branch 'jc/cache-tree' into next
6968
Merge branch 'jc/diffstat' into next
6969
Merge branch 'pb/config' into next
6970
Merge branch 'jc/cache-tree' into next
6971
Merge branch 'nh/fetch-http' into next
6972
Merge branch 'se/rebase' into next
6973
Merge branch 'jc/cache-tree' into next
6974
Merge branch 'jc/cache-tree' into next
6975
Merge branch 'master' into next
6976
8380
Retire rabinpoly fingerprinting code
6977
8381
Fix mismerged update-index from jc/cache-tree branch.
6978
Merge branch 'jc/pathcheck' into next
6979
Merge branch 'jc/cache-tree' into next
6980
Merge branch 'np/delta' into next
6981
Merge branch 'jc/count' into next
6982
Merge branch 'jc/cache-tree' into next
6983
Merge branch 'master' into next
6984
Merge branch 'np/delta' into next
6985
Merge branch 'jc/diff' into next
6986
Merge branch 'lt/push' into next
6987
Merge branch 'jc/diff' into next
6988
Merge branch 'lt/push' into next
6989
Merge branch 'jc/grep' into next
6990
Merge branch 'jc/xsha1-2' into next
6991
Merge branch 'jc/xsha1' into next
6992
Merge branch 'jc/fmt-patch' into next
6993
Merge branch 'jc/grep' into next
6994
Merge branch 'jc/cache-tree' into next
6995
8382
read-tree: --prefix=<path>/ option.
6996
8383
write-tree: --prefix=<path>
6997
Merge branch 'jc/diff' into next
6998
Merge branch 'jc/logs' into next
6999
Merge branch 'jc/count' into next
7000
Merge branch 'jc/show-branch-dense' into next
7001
Merge branch 'lt/push' into next
7002
Merge branch 'js/remoteconfig' into next
7003
Merge branch 'jc/grep' into next
7004
Merge branch 'js/remoteconfig' into next
7005
Merge branch 'jc/grep' into next
7006
Merge branch 'master' into next
7007
Merge branch 'js/repoconfig' into next
7008
Merge branch 'np/delta' into next
7009
Merge branch 'jc/grep' into next
7010
Merge branch 'jc/symref' into next
7011
Merge branch 'jc/count' into next
7012
Merge branch 'jc/cache-tree' into next
7013
Merge branch 'js/repoconfig' into next
7014
Merge branch 'master' into next
7015
Merge branch 'js/fetchconfig' into next
7016
Merge branch 'jc/grep' into next
7017
Merge branch 'jc/cache-tree' into next
7018
Merge branch 'js/fmt-patch' into next
7019
Merge branch 'jc/bindiff' into next
7020
Merge branch 'jc/bindiff' into next
7021
Merge branch 'jc/reupdate' into next
7022
Merge branch 'jc/reupdate' into next
7023
Merge branch 'js/fmt-patch' into next
7024
Merge branch 'jc/cache-tree' into next
7025
Merge branch 'mw/alternates' into next
7026
Merge branch 'jc/gitlink' into next
7027
Merge branch 'jc/grep' into next
7028
Merge branch 'jc/xsha1' into next
7029
Merge branch 'jc/bindiff' into next
7030
Merge branch 'jc/clean' into next
7031
Merge branch 'ml/cvs' into next
7032
Merge branch 'jc/grep' into next
7033
Merge branch 'jc/grep' into next
7034
Merge branch 'master' into next
7035
Merge branch 'lt/config' into next
7036
Merge branch 'lt/diff' into next
7037
Merge branch 'lt/oneway' into next
7038
Merge branch 'se/rev-parse' into next
7039
Merge branch 'se/rebase' into next
7040
Merge branch 'se/diff' into next
7041
Merge branch 'lt/oneway' into next
7042
Merge branch 'jc/apply' into next
7043
Merge branch 'jc/grep' into next
7044
Merge branch 'se/tag' into next
7045
Merge branch 'lt/oneway' into next
7046
Merge branch 'np/pack' into next
7047
Merge branch 'ew/send-email' into next
7048
Merge branch 'jc/grep' into next
7049
Merge branch 'jc/apply' into next
7050
Merge branch 'master' into next
7051
Merge branch 'jc/diff' into next
7052
Merge branch 'np/pack' into next
7053
Merge branch 'master' into next
7054
Merge branch 'jc/grep' into next
7055
Merge branch 'ew/pretty-fmt' into next
7056
8384
read-tree: reorganize bind_merge code.
7057
Merge branch 'jc/gitlink' into next
7058
Merge branch 'lt/dirwalk' into next
7059
Merge branch 'jc/grep' into next
7060
Merge branch 'lt/grep' into next
7061
Merge branch 'jc/read-tree-safety' into next
7062
Merge branch 'jc/apply' into next
7063
Merge branch 'sp/reflog' into next
7064
Merge branch 'lt/dirwalk' into next
7065
Merge branch 'master' into next
7066
Merge branch 'lt/dirwalk' into next
7067
Merge branch 'lt/dirwalk' into next
7068
Merge branch 'ts/doctar' into next
7069
Merge branch 'eb/quilt' into next
7070
Merge branch 'lt/dirwalk' into next
7071
Merge branch 'master' into next
7072
Merge branch 'jc/tartree' into next
7073
Merge branch 'jc/dirwalk-n-cache-tree' into next
7074
Merge branch 'js/fmt-patch' into next
7075
Merge branch 'js/fmt-patch' into next
7076
Merge branch 'jc/mailinfo' into next
7077
Merge branch 'master' into next
7078
Merge branch 'jc/fetch-sorted' into next
7079
Merge branch 'jc/fmt-patch' into next
7080
Merge branch 'se/http' into next
7081
Merge branch 'master' into next
7082
Merge branch 'jc/dirwalk-n-cache-tree' into next
7083
Merge branch 'jc/builtin-n-tar-tree' into next
7084
Merge branch 'be/tag' into next
7085
Merge branch 'eb/mailinfo' into next
7086
Merge branch 'sp/reflog' into next
7087
Merge branch 'master' into next
7088
Merge branch 'master' into next
7089
Merge branch 'lt/apply' into next
7090
Merge branch 'sp/reflog' into next
7091
8385
fetch-pack: give up after getting too many "ack continue"
7092
Merge branch 'jc/fetchupload' into next
7093
Merge branch 'sp/reflog' into next
7094
Merge branch 'ew/tests' into next
7095
Merge branch 'eb/mailinfo' into next
7096
Merge branch 'master' into next
7097
Merge branch 'master' into next
7098
Merge branch 'jc/cache-tree' into next
7099
Merge branch 'jc/lt-tree-n-cache-tree' into next
7100
Merge branch 'jc/lt-tree-n-cache-tree' into next
7101
Merge branch 'master' into next
7102
Merge branch 'lt/tree-2' into next
7103
Merge branch 'ff/svnimport' into next
7104
Merge branch 'jc/fmt-patch' into next
7105
Merge branch 'sp/reflog' into next
7106
Merge branch 'nh/http' into next
7107
Merge branch 'master' into next
7108
Merge branch 'master' into next
7109
Merge branch 'jc/fmt-patch' into next
7110
Merge branch 'lt/tree-2' into next
7111
Merge branch 'master' into next
7112
Merge branch 'jc/fmt-patch' into next
7113
Merge branch 'vb/sendemail' into next
7114
Merge branch 'new' of git://git.kernel.org/pub/scm/gitk/gitk into next
7115
8386
Fix earlier mismerges.
7116
Merge branch 'js/alias' into next
7117
Merge branch 'master' into next
7118
Merge branch 'vb/sendemail' into next
7119
Merge branch 'vb/sendemail' into next
7120
Merge branch 'jc/lockfile' into next
7121
Merge branch 'master' into next
7122
Merge branch 'master' into next
7123
Merge branch 'master' into next
7124
Merge branch 'pe/date' into next
7125
8387
shared repository: optionally allow reading to "others".
7126
Merge branch 'jc/shared' into next
7127
Merge branch 'master' into next
7128
8388
gitk: rereadrefs needs listrefs
7129
Merge git://git.kernel.org/pub/scm/gitk/gitk
7130
Merge git://git.bogomips.org/git-svn
7131
8389
fix git alias
7132
8390
t5100: mailinfo and mailsplit tests.
7133
8391
mailinfo: ignore blanks after in-body headers.
7134
Merge branch 'js/diff'
7135
Merge branch 'pe/date'
7136
Merge branch 'jc/rw-prefix'
7137
Merge early part of branch 'jc/fetchupload'
7138
Merge branch 'eb/mail' into next
7139
Merge branch 'yl/build' into next
7140
Merge branch 'master' into next
7141
Merge branch 'eb/mail'
7142
Merge branch 'jc/shared'
7143
Merge branch 'yl/build'
7144
Merge branch 'pb/config' into next
7145
Merge branch 'jn/web' into next
7146
Merge early parts of branch 'ls/am'
7147
Merge early parts of branch 'ff/c99'
7148
8392
fix rfc2047 formatter.
7149
8393
xdiff: minor changes to match libxdiff-0.21
7150
8394
Restore SIGCHLD to SIG_DFL where we care about waitpid().
7151
Merge branches 'js/lsfix', 'pb/config' and 'jn/web' into next
7152
Merge branch 'lt/objlist' into next
7153
Merge branch 'jc/waitpid' into next
7154
Merge branch 'pb/config' into next
7155
Merge branch 'jn/web' into next
7156
Merge branch 'master' into next
7157
Merge branch 'jn/web' into next
7158
Merge branch 'jn/web' into next
7159
8395
checkout -f: do not leave untracked working tree files.
7160
Merge branch 'master' into next
7161
Merge branch 'jn/web' into next
7162
8396
upload-pack: avoid sending an incomplete pack upon failure
7163
8397
upload-pack: prepare for sideband message support.
7164
8398
Retire git-clone-pack
7165
8399
upload-pack/fetch-pack: support side-band communication
7166
Merge branch 'jc/upload-corrupt' into next
7167
Merge branch 'ff/c99' into next
7168
8400
Add renaming-rebase test.
7169
Merge branch 'ew/rebase' into next
7170
8401
daemon: send stderr to /dev/null instead of closing.
7171
Merge branch 'jn/web' into next
7172
Merge branch 'jc/upload-corrupt' into next
7173
Merge branch 'master' into next
7174
8402
rebase --merge: fix for rebasing more than 7 commits.
7175
8403
Makefile: do not force unneeded recompilation upon GIT_VERSION changes
7176
Merge branch 'lt/objlist'
7177
Merge branch 'pb/config'
7178
Merge branch 'ff/c99'
7179
Merge branch 'jc/waitpid'
7180
Merge branch 'jn/web' into next
7181
Merge branch 'ew/rebase' into next
7182
Merge branch 'jc/upload-corrupt'
7183
Merge early parts of branch 'js/diff'
7184
Merge branch 'jn/web'
7185
Merge branch 'ew/rebase'
7186
Merge branch 'js/lsfix'
7187
Merge branch 'master' into next
7188
8404
7189
8405
Linus Torvalds (9):
7190
8406
Tentative built-in "git show"
7252
8468
Horst H. von Brand (1):
7253
8469
Fix formatting of Documentation/git-clone.txt
7254
8470
7255
Junio C Hamano (8):
8471
Junio C Hamano (7):
7256
8472
allow working in repositories with textual symref HEAD
7257
8473
git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin
7258
8474
git-rm: honor -n flag.
7259
8475
builtin-init-db: spell the in-program configuration variable in lowercase.
7260
8476
shared repository - add a few missing calls to adjust_shared_perm().
7261
8477
git-clone: fix --bare over dumb-http
7262
Merge git://git.kernel.org/pub/scm/git/gitweb
7263
8478
GIT 1.4.0
7264
8479
7265
8480
Kay Sievers (143):
7444
8659
Misc doc improvements
7445
8660
Document git-ls-tree --fullname
7446
8661
7447
Junio C Hamano (16):
8662
Junio C Hamano (12):
7448
8663
git alias: try alias last.
7449
8664
send-email: be more lenient and just catch obvious mistakes.
7450
8665
send-email: a bit more careful domain regexp.
7453
8668
Make index file locking code reusable to others.
7454
8669
refs.c: convert it to use lockfile interface.
7455
8670
ref-log: style fixes.
7456
Merge branch 'vb/sendemail'
7457
Merge branch 'js/alias'
7458
Merge branch 'jc/lockfile'
7459
Merge git://git.kernel.org/pub/scm/gitk/gitk
7460
8671
Documentation: add missing docs make check-docs found.
7461
8672
make clean: remove dist-doc targets.
7462
8673
Documentation: git-ls-tree (typofix)
7466
8677
HTTP cleanup
7467
8678
http-fetch: fix possible segfault
7468
8679
7469
Paul Mackerras (14):
8680
Paul Mackerras (12):
7470
8681
gitk: Make a row of controls for controlling highlighting
7471
Merge branch 'master' into new
7472
8682
gitk: Highlight entries in the file list as well
7473
8683
gitk: Highlight paths of interest in tree view as well
7474
8684
gitk: First cut at a search function in the patch/file display window
7477
8687
gitk: Fix bug in highlight stuff when no line is selected
7478
8688
gitk: Provide ability to highlight based on relationship to selected commit
7479
8689
gitk: Add a goto next/previous highlighted commit function
7480
Merge branch 'master' into new
7481
8690
gitk: Show nearby tags
7482
8691
gitk: Show branch name(s) as well, if "show nearby tags" is enabled
7483
8692
gitk: Re-read the descendent/ancestor tag & head info on update
7618
8827
Josef Weidendorfer (1):
7619
8828
gitk: Add a visual tag for remote refs
7620
8829
7621
Junio C Hamano (268):
8830
Junio C Hamano (156):
7622
8831
Fix up default abbrev in setup_revisions() argument parser.
7623
8832
Fix up rev-list option parsing.
7624
8833
Split init_revisions() out of setup_revisions()
7625
8834
rev-list option parser fix.
7626
8835
Built-in git-whatchanged.
7627
8836
Do not fork PAGER=cat
7628
Merge branch 'master' into lt/logopt
7629
8837
Simplify common default options setup for built-in log family.
7630
8838
log/whatchanged/show - log formatting cleanup.
7631
8839
rev-list --header: output format fix
7632
8840
git.c: LOGSIZE is unused after log printing cleanup.
7633
8841
combine-diff: show diffstat with the first parent.
7634
8842
Fix "git log --stat": make sure to set recursive with --stat.
7635
Merge branch 'lt/logopt'
7636
Merge branch 'jc/pager-cat'
7637
8843
Tentative built-in format-patch.
7638
Merge branch 'fix'
7639
8844
sha1_name.c: prepare to make get_tree_entry() reusable from others.
7640
8845
sha1_name.c: no need to include diff.h; tree-walk.h will do.
7641
8846
get_tree_entry(): make it available from tree-walk
7642
8847
Minor tweak on subject line in --pretty=email
7643
8848
diff: move diff.c to diff-lib.c to make room.
7644
Merge branch 'maint'
7645
Merge branch 'lt/xsha1'
7646
8849
Add git-unresolve <paths>...
7647
8850
diff --stat: do not drop rename information.
7648
8851
git-update-index --unresolve
7649
Merge branch 'fix'
7650
8852
rename internal format-patch wip
7651
Merge branch 'fix'
7652
Merge branch 'fix'
7653
Merge branch 'master' into jc/fmt-patch
7654
8853
Makefile: dependency for builtin-help.o
7655
Merge branch 'jc/diff'
7656
8854
Add colordiff for git to contrib/colordiff.
7657
8855
Fix "git show --stat"
7658
8856
Libify diff-files.
7665
8863
Invalidate cache-tree entries for touched paths in git-apply.
7666
8864
Use cache-tree in update-index.
7667
8865
Add test-dump-cache-tree
7668
Merge git://git.kernel.org/pub/scm/gitk/gitk
7669
Merge branch 'jc/color'
7670
Merge branch 'jc/unresolve'
7671
Merge branch 'jc/cc-stat'
7672
Merge branch 'sh/daemon'
7673
Merge branch 'ar/chmod-series'
7674
8866
cache-tree: protect against "git prune".
7675
8867
index: make the index file format extensible.
7676
Merge branch 'fix'
7677
8868
Teach fsck-objects about cache-tree.
7678
8869
cache-tree: sort the subtree entries.
7679
8870
test-dump-cache-tree: report number of subtrees.
7680
8871
Makefile: remove and create libgit.a from scratch.
7681
Merge branch 'jc/diff'
7682
8872
diff --stat: show complete rewrites consistently.
7683
8873
git-cvsserver: typofixes
7684
8874
t0000-basic: Add ls-tree recursive test back.
7685
8875
Makefile: remove and create xdiff library from scratch.
7686
8876
commit-tree: allow generic object name for the tree as well.
7687
Merge branch 'master' into jc/cache-tree
7688
Merge branch 'fix'
7689
8877
revision parsing: make "rev -- paths" checks stronger.
7690
8878
t0000-basic: more commit-tree tests.
7691
Merge branch 'master' into jc/cache-tree
7692
8879
update-index: when --unresolve, smudge the relevant cache-tree entries.
7693
8880
read-tree: teach 1 and 2 way merges about cache-tree.
7694
8881
read-tree: teach 1-way merege and plain read to prime cache-tree.
7695
8882
diff-index: fix compilation warnings.
7696
Merge branch 'jc/diffstat'
7697
Merge branch 'pb/config'
7698
Merge branch 'fix'
7699
8883
cache_tree_update: give an option to update cache-tree only.
7700
8884
test-dump-cache-tree: validate the cached data as well.
7701
8885
pack-objects: update size heuristucs.
7702
8886
built-in count-objects.
7703
8887
cache-tree.c: typefix
7704
Merge branch 'fix'
7705
8888
built-in diff.
7706
8889
built-in diff: assorted updates.
7707
8890
builtin-diff.c: die() formatting type fix.
7708
Merge branch 'fix'
7709
8891
Fix builtin-push to honor Push: lines in remotes file.
7710
8892
Extended SHA1 -- "rev^@" syntax to mean "all parents"
7711
8893
get_sha1(): :path and :[0-3]:path to extract from index.
7715
8897
builtin-grep: support '-l' option.
7716
8898
builtin-grep: do not use setup_revisions()
7717
8899
fsck-objects: mark objects reachable from cache-tree
7718
Merge branch 'se/rebase'
7719
Merge branch 'nh/fetch-http'
7720
Merge branch 'jc/pathcheck'
7721
Merge branch 'jc/pack'
7722
Merge branch 'jc/xsha1-2'
7723
8900
builtin-count-objects: make it official.
7724
8901
builtin-diff: call it "git-diff", really.
7725
8902
builtin-log/whatchanged/show: make them official.
7727
8904
builtin-push: make it official.
7728
8905
builtin-grep: printf %.*s length is int, not ptrdiff_t.
7729
8906
Revert "fetch, pull: ask config for remote information"
7730
Merge branch 'fix'
7731
8907
builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
7732
8908
builtin-grep: allow more than one patterns.
7733
8909
builtin-grep: support -c (--count).
7734
8910
builtin-grep: support -w (--word-regexp).
7735
8911
builtin-grep: tighten path wildcard vs tree traversal.
7736
Merge git://git.kernel.org/pub/scm/gitk/gitk
7737
8912
core.prefersymlinkrefs: use symlinks for .git/HEAD
7738
8913
repo-config: readability fixups.
7739
8914
builtin-count-objects: open packs when running -v
7740
8915
Fix test-dump-cache-tree in one-tree disappeared case.
7741
8916
read-tree: invalidate cache-tree entry when a new index entry is added.
7742
8917
cache-tree: a bit more debugging support.
7743
Merge branch 'fix'
7744
8918
builtin-grep: terminate correctly at EOF
7745
8919
builtin-grep: binary files -a and -I
7746
8920
fsck-objects: do not segfault on missing tree in cache-tree
7747
8921
builtin-grep: -L (--files-without-match).
7748
Merge branch 'maint'
7749
Merge branch 'js/remoteconfig'
7750
Merge branch 'jc/count'
7751
Merge branch 'js/repoconfig'
7752
Merge branch 'jc/diff'
7753
Merge branch 'jc/symref'
7754
Merge branch 'jc/show-branch-dense'
7755
Merge branch 'jc/logs'
7756
8922
Makefile: do not link rev-list any specially.
7757
8923
delta: stricter constness
7758
Merge branch 'fix'
7759
8924
pack-object: squelch eye-candy on non-tty
7760
8925
binary patch.
7761
8926
binary diff: further updates.
7765
8930
update-index --again
7766
8931
update-index --again: take optional pathspecs
7767
8932
binary diff and apply: testsuite.
7768
Merge branch 'master' into js/fmt-patch
7769
Merge branch 'fix'
7770
8933
Teach -f <file> option to builtin-grep.
7771
8934
builtin-grep: documentation
7772
8935
get_sha1() - fix infinite loop on nonexistent stage.
7773
Merge branch 'fix'
7774
8936
Teach git-clean optional <paths>... parameters.
7775
8937
builtin-grep: tighten argument parsing.
7776
Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff into ml/cvs
7777
Merge branch 'fix'
7778
Merge branch 'jc/bindiff'
7779
Merge branch 'np/delta'
7780
Merge branch 'jc/again'
7781
Merge branch 'jc/xsha1'
7782
Merge branch 'mw/alternates'
7783
Merge branch 'jc/clean'
7784
8938
builtin-grep: typofix
7785
8939
builtin-grep: -w fix
7786
8940
builtin-grep: -F (--fixed-strings)
7787
8941
checkout: use --aggressive when running a 3-way merge (-m).
7788
Merge branch 'fix'
7789
Merge branch 'lt/fix-config' into lt/config
7790
Merge branch 'fix'
7791
Merge branch 'ml/cvs'
7792
Merge branch 'fix'
7793
8942
diffstat rename squashing fix.
7794
8943
read-tree -u one-way merge fix to check out locally modified paths.
7795
Merge branch 'fix'
7796
8944
apply --numstat: show new name, not old name.
7797
8945
builtin-grep: unparse more command line options.
7798
Merge branch 'fix'
7799
8946
apply --cached: apply a patch without using working tree.
7800
8947
git-am: use apply --cached
7801
Merge branch 'lt/diff'
7802
Merge branch 'jc/grep'
7803
Merge branch 'lt/config'
7804
Merge branch 'ew/send-email'
7805
Merge branch 'lt/oneway'
7806
8948
builtin-diff: fix comparison between two blobs.
7807
Merge branch 'se/rebase'
7808
Merge branch 'se/diff'
7809
Merge branch 'se/rev-parse'
7810
Merge branch 'se/tag'
7811
8949
merge-base: Clarify the comments on post processing.
7812
Merge branch 'np/pack'
7813
Merge branch 'maint'
7814
8950
read-tree -m -u: do not overwrite or remove untracked working tree files.
7815
8951
builtin-grep: workaround for non GNU grep.
7816
8952
Revert "builtin-grep: workaround for non GNU grep."
7817
Merge branch 'jc/apply'
7818
Merge branch 'ew/pretty-fmt'
7819
8953
apply --cached: do not check newly added file in the working tree
7820
Merge branch 'maint'
7821
8954
builtin-add: fix unmatched pathspec warnings.
7822
8955
builtin-diff: do not say files are renamed when blob and file are given
7823
Merge early part of 'sp/reflog' branch
7824
Merge part of 'js/fmt-patch' for RFC2822 dates into 'sp/reflog'
7825
Merge branch 'ts/doctar'
7826
Merge branch 'lt/grep'
7827
Merge branch 'jc/grep'
7828
Merge branch 'eb/quilt'
7829
Merge branch 'jc/apply'
7830
Merge branch 'jc/read-tree-safety'
7831
8956
Fix build procedure for builtin-init-db
7832
Merge branch 'js/fetchconfig'
7833
8957
built-in tar-tree and remote tar-tree
7834
Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache-tree
7835
Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree
7836
Merge branch 'master' into js/fmt-patch
7837
8958
git-format-patch: now built-in.
7838
8959
checkdiff_consume: strtol parameter fix.
7839
8960
git-rebase: use canonical A..B syntax to format-patch
7845
8966
fetch-pack: output refs in the order they were given on the command line.
7846
8967
Tutorial #2: broken link fix.
7847
8968
builtin-rm: squelch compiler warnings.
7848
Merge branch 'jc/tartree' into jc/builtin-n-tar-tree
7849
8969
cvsimport: do not barf on creation of an empty file.
7850
Merge branch 'lt/dirwalk'
7851
Merge branch 'jc/fetch-sorted'
7852
Merge branch 'jc/builtin-n-tar-tree'
7853
Merge branch 'js/fmt-patch'
7854
Merge branch 'be/tag'
7855
Merge branch 'jc/fmt-patch'
7856
8970
apply: force matching at the beginning.
7857
Merge branch 'master' into lt/apply
7858
8971
fetch.c: remove an unused variable and dead code.
7859
Merge branch 'master' into sp/reflog
7860
8972
ls-remote: fix rsync:// to report HEAD
7861
8973
mailinfo: More carefully parse header lines in read_one_header_line()
7862
8974
gitk: start-up bugfix
7863
8975
built-in format-patch: various fixups.
7864
8976
format-patch: -n and -k are mutually exclusive.
7865
8977
Let git-clone to pass --template=dir option to git-init-db.
7866
Merge branch 'eb/mailinfo'
7867
Merge branch 'jc/mailinfo'
7868
8978
git-fetch: avoid using "case ... in (arm)"
7869
Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache-tree
7870
Merge branch 'lt/tree' into jc/lt-tree-n-cache-tree
7871
Merge branch 'jc/cache-tree'
7872
Merge branch 'lt/apply'
7873
8979
adjust to the rebased series by Linus.
7874
Merge branch 'jc/lt-tree-n-cache-tree' into lt/tree-2
7875
8980
send-email: do not pass bogus address to local sendmail binary
7876
Merge branch 'ew/tests'
7877
8981
format-patch --signoff
7878
8982
fetch.c: do not pass uninitialized lock to unlock_ref().
7879
Merge git://git.kernel.org/pub/scm/gitk/gitk
7880
Merge branch 'nh/http'
7881
8983
fetch.c: do not call process_tree() from process_tree().
7882
Merge branch 'ds/doc' into jc/fmt-patch
7883
8984
fetch: do not report "same" unless -verbose.
7884
Merge branch 'jc/fmt-patch'
7885
8985
read-tree --reset: update working tree file for conflicted paths.
7886
Merge branch 'ff/svnimport'
7887
Merge branch 'sp/reflog'
7888
Merge branch 'lt/tree-2'
7889
8986
rev-parse: tighten constness properly.
7890
8987
7891
8988
Linus Torvalds (60):
7954
9051
Make git-check-format-ref a builtin.
7955
9052
SubmittingPatches: The download location of External Editor has moved
7956
9053
7957
Martin Langhoff (10):
9054
Martin Langhoff (7):
7958
9055
git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
7959
Merge with git://kernel.org/pub/scm/git/git.git
7960
Merge with git://kernel.org/pub/scm/git/git.git
7961
cvsserver: use git-rev-list instead of git-log
7962
cvsserver: use git-rev-list instead of git-log
7963
Merge with git://kernel.org/pub/scm/git/git.git
9056
cvsserver: use git-rev-list instead of git-log
9057
cvsserver: use git-rev-list instead of git-log
7964
9058
cvsimport: minor fixups
7965
9059
cvsimport: replace anonymous sub ref with a normal sub
7966
9060
cvsimport: introduce -L<imit> option to workaround memory leaks
8002
9096
pack-object: slightly more efficient
8003
9097
improve depth heuristic for maximum delta size
8004
9098
8005
Paul Mackerras (22):
9099
Paul Mackerras (19):
8006
9100
gitk: Implement multiple views
8007
9101
gitk: Make File->Update work properly again
8008
Merge branch 'master' into new
8009
9102
gitk: Fix various bugs in the view support
8010
9103
gitk: Don't reread git-rev-list output from scratch on view switch
8011
9104
gitk: Remember the view in the history list
8012
9105
gitk: Let git-rev-list do the argument list parsing
8013
9106
gitk: Use git-rev-parse only to identify file/dir names on cmd line
8014
Merge branch 'master' into new
8015
9107
gitk: Implement "permanent" views (stored in ~/.gitk)
8016
9108
gitk: add menu item for editing the current view
8017
Merge branch 'new'
8018
9109
gitk: Use a text widget for the file list
8019
9110
gitk: Add a tree-browsing mode
8020
9111
gitk: Basic support for highlighting one view within another
8148
9239
Johannes Schindelin (1):
8149
9240
repo-config: trim white-space before comment
8150
9241
8151
Junio C Hamano (8):
9242
Junio C Hamano (6):
8152
9243
core.prefersymlinkrefs: use symlinks for .git/HEAD
8153
9244
repo-config: document what value_regexp does a bit more clearly.
8154
9245
Fix repo-config set-multivar error return path.
8155
9246
Documentation: {caret} fixes (git-rev-list.txt)
8156
9247
checkout: use --aggressive when running a 3-way merge (-m).
8157
Merge branch 'fix' into maint
8158
Merge branch 'fix' into maint
8159
9248
Fix pack-index issue on 64-bit platforms a bit more portably.
8160
9249
8161
9250
Linus Torvalds (3):
8272
9361
Jonas Fonseca (1):
8273
9362
Add git-annotate(1) and git-blame(1)
8274
9363
8275
Junio C Hamano (12):
9364
Junio C Hamano (9):
8276
9365
rev-list --bisect: limit list before bisecting.
8277
9366
diff-tree: typefix.
8278
9367
diff --stat: do not do its own three-dashes.
8279
9368
diff-files --stat: do not dump core with unmerged index.
8280
9369
reading $GIT_DIR/info/graft - skip comments correctly.
8281
Merge git://git.kernel.org/pub/scm/gitk/gitk
8282
9370
rev-list --boundary: show boundary commits even when limited otherwise.
8283
Merge branch 'jc/bottomless'
8284
Merge branch 'jc/boundary'
8285
9371
packed_object_info_detail(): check for corrupt packfile.
8286
9372
diff --stat: make sure to set recursive.
8287
9373
GIT 1.3.0
8320
9406
diff-options: add --stat (take 2)
8321
9407
diff-options: add --stat (take 2)
8322
9408
8323
Junio C Hamano (66):
8324
Merge branch 'lt/fix-sol-pack' into next
8325
Merge branch 'jc/clone' into next
8326
Merge branch 'lt/fix-sol-pack' into next
8327
Merge early part of 'jc/combine' branch
8328
Merge branch 'pe/cleanup' into next
8329
Merge branch 'pb/regex' into next
8330
Merge branch 'jc/combine' into next
8331
Merge branch 'pb/regex' into next
8332
Merge branch 'nh/http' into next
8333
Merge branches 'master' and 'jc/combine' into next
8334
Merge branch 'jc/combine' into next
8335
Merge branch 'nh/http' into next
8336
Merge branch 'jc/blame' into next
8337
Merge branch 'jc/date' into next
8338
Merge branch 'master' into next
8339
Merge branch 'kh/svn' into next
8340
Merge branch 'jc/blame' into next
8341
Merge branch 'ew/rev-abbrev' into next
8342
Merge branch 'jc/thinpack' into next
8343
Merge branch 'master' into next
8344
Merge branch 'master' into next
9409
Junio C Hamano (31):
8345
9410
git-log: match rev-list --abbrev and --abbrev-commit
8346
9411
diff: fix output of total-rewrite diff.
8347
9412
diffcore-rename: fix merging back a broken pair.
8348
9413
log-tree: separate major part of diff-tree.
8349
9414
git log [diff-tree options]...
8350
Merge branch 'jc/diff' into next
8351
9415
Retire diffcore-pathspec.
8352
Merge branch 'lt/rev'
8353
Merge branch 'master' into jc/diff
8354
9416
tree-diff: do not assume we use only one pathspec
8355
9417
git log --full-diff
8356
9418
Retire git-log.sh
8357
9419
blame and friends: adjust to multiple pathspec change.
8358
9420
Retire git-log.sh (take#2)
8359
9421
diff-* --patch-with-raw
8360
Merge branch 'jc/withraw' into next
8361
Merge branch 'eb/apply' into next
8362
9422
Retire git-log.sh (take #3)
8363
Merge branch 'jc/withraw' into next
8364
Merge branch 'ds/index' into next
8365
9423
combine-diff: do not lose hunks with only deletion at end.
8366
9424
combine-diff: fix hunks at the end (take #2).
8367
Merge branch 'jc/diff' into next
8368
Merge branch 'jc/combine' into next
8369
9425
Retire t5501-old-fetch-and-upload test.
8370
9426
git-commit: do not muck with commit message when no_edit is set.
8371
9427
stripspace: make sure not to leave an incomplete line.
8372
9428
combine-diff: type fix.
8373
Merge branch 'master' into jc/combine
8374
Merge branch 'jc/combine' into next
8375
9429
Documentation: add a couple of missing docs.
8376
9430
Makefile: $(MAKE) check-docs
8377
9431
git-log: do not output excess blank line between commits
8383
9437
Retire git-log.sh (take #4)
8384
9438
git-log <diff-options> <paths> documentation
8385
9439
"git cmd -h" for shell scripts.
8386
Merge branch 'jc/fix5500'
8387
Merge branch 'js/diffstat'
8388
Merge branch 'dl/xdiff'
8389
9440
GIT v1.3.0-rc4
8390
9441
8391
9442
Linus Torvalds (4):
8420
9471
Jon Loeliger (1):
8421
9472
Added Packing Heursitics IRC writeup.
8422
9473
8423
Junio C Hamano (28):
9474
Junio C Hamano (16):
8424
9475
git-clone: fix handling of upsteram whose HEAD does not point at master.
8425
9476
combine-diff: use built-in xdiff.
8426
9477
parse_date(): fix parsing 03/10/2006
8427
9478
combine-diff: refactor built-in xdiff interface.
8428
9479
diff_flush(): leakfix.
8429
Merge branch 'fix'
8430
9480
combine-diff: move the code to parse hunk-header into common library.
8431
Merge git://git.kernel.org/pub/scm/gitk/gitk
8432
Merge branch 'pb/regex'
8433
Merge branch 'jc/clone'
8434
9481
blame: use built-in xdiff
8435
9482
date parsing: be friendlier to our European friends.
8436
9483
blame.c: fix completely broken ancestry traversal.
8440
9487
Thin pack generation: optimization.
8441
9488
rev-list --abbrev-commit
8442
9489
count-delta: match get_delta_hdr_size() changes.
8443
Merge branch 'maint'
8444
Merge git://git.kernel.org/pub/scm/gitk/gitk
8445
Merge branch 'jc/blame'
8446
Merge branch 'ew/rev-abbrev'
8447
Merge branch 'nh/http'
8448
Merge branch 'jc/date'
8449
Merge branch 'jc/thinpack'
8450
Merge branch 'kh/svn'
8451
9490
GIT 1.3.0-rc3
8452
9491
8453
9492
Karl Hasselström (1):
8516
9555
Jim Radford (1):
8517
9556
fix repacking with lots of tags
8518
9557
8519
Junio C Hamano (18):
9558
Junio C Hamano (14):
8520
9559
rev-list --no-merges: argument parsing fix.
8521
9560
rev-list: memory usage reduction.
8522
9561
rev-list --boundary
8524
9563
revision.c "..B" syntax: constness fix
8525
9564
assume unchanged git: diff-index fix.
8526
9565
tree/diff header cleanup.
8527
Merge git://git.kernel.org/pub/scm/gitk/gitk
8528
9566
rev-list --boundary: fix re-injecting boundary commits.
8529
9567
Makefile: many programs now depend on xdiff/lib.a having been built.
8530
9568
revision: --topo-order and --unpacked
8531
9569
revision: simplify argument parsing.
8532
9570
revision: --max-age alone does not need limit_list() anymore.
8533
9571
safe_fgets() - even more anal fgets()
8534
Merge branch 'lt/fix-sol-pack'
8535
Merge branch 'pe/cleanup'
8536
Merge in xdiff cleanup pieces
8537
9572
GIT 1.3.0-rc2
8538
9573
8539
9574
Linus Torvalds (5):
8735
9770
Josef Weidendorfer (1):
8736
9771
git-mv: fix moves into a subdir from outside
8737
9772
8738
Junio C Hamano (355):
9773
Junio C Hamano (137):
8739
9774
"Assume unchanged" git
8740
9775
"Assume unchanged" git: do not set CE_VALID with --refresh
8741
9776
ls-files: debugging aid for CE_VALID changes.
8742
Merge branches 'jc/nostat' and 'jc/empty-commit'
8743
Merge branch 'jc/ls-files-o'
8744
9777
"Assume unchanged" git: --really-refresh fix.
8745
Merge branch 'jc/nostat'
8746
Merge branch 'lt/diff-tree'
8747
Merge branch 'master'
8748
Merge branch 'jc/status'
8749
Merge branch 'lt/diff-tree'
8750
Merge branch 'master'
8751
Merge branch 'master'
8752
9778
ls-files: split "show-valid-bit" into a different option.
8753
9779
"assume unchanged" git: documentation.
8754
Merge branch 'jc/nostat'
8755
Merge branch 'master'
8756
Merge branch 'master'
8757
Merge branch 'pb/bisect'
8758
Merge branch 'master'
8759
9780
cache_name_compare() compares name and stage, nothing else.
8760
9781
git-commit: Now --only semantics is the default.
8761
9782
rebase: allow a hook to refuse rebasing.
8762
Merge branch 'jc/nostat'
8763
Merge branch 'jc/rebase'
8764
Merge branch 'jc/commit'
8765
Merge branch 'ra/email'
8766
Merge branch 'pb/bisect'
8767
Merge some proposed fixes
8768
Merge branch 'master'
8769
9783
commit: detect misspelled pathspec while making a partial commit.
8770
9784
rebase: allow rebasing onto different base.
8771
Merge branch 'ra/email'
8772
Merge branch 'jc/rebase'
8773
Merge branch 'jc/commit'
8774
Merge branch 'kh/svn'
8775
Merge branch 'master'
8776
Merge branch 'fix'
8777
Merge branch 'jc/rebase-limit'
8778
9785
ls-files --error-unmatch pathspec error reporting fix.
8779
9786
Detect misspelled pathspec to git-add
8780
Merge branch 'jc/add'
8781
9787
packed objects: minor cleanup
8782
Merge fixes up to 1.2.1
8783
Merge branch 'jc/add'
8784
Merge master to get fixes up to 1.2.1
8785
9788
topo-order: make --date-order optional.
8786
Merge branch 'jc/topo'
8787
Merge branch 'lt/merge-tree'
8788
9789
pack-objects: reuse data from existing packs.
8789
9790
pack-objects: finishing touches.
8790
9791
git-repack: allow passing a couple of flags to pack-objects.
8791
Merge branch 'jc/pack-reuse'
8792
9792
git-tag: -l to list tags (usability).
8793
9793
Add contrib/README.
8794
9794
SubmittingPatches: note on whitespaces
8795
Merge branch 'fix'
8796
Merge branch 'js/portable'
8797
9795
pack-objects: avoid delta chains that are too long.
8798
Merge branch 'jc/pack-reuse'
8799
Merge branch 'jc/rebase-limit'
8800
Merge branch 'jc/topo'
8801
9796
Make "empty ident" error message a bit more helpful.
8802
Merge branch 'jc/ident'
8803
Merge branch 'fix'
8804
9797
Delay "empty ident" errors until they really matter.
8805
9798
Keep Porcelainish from failing by broken ident after making changes.
8806
9799
fmt-merge-msg: say which branch things were merged into unless 'master'
8807
Merge fixes up to GIT 1.2.2
8808
Merge branch 'jc/merge-msg' into next
8809
Merge branch 'jc/ident' into next
8810
Merge part of js/portable into next
8811
9800
Allow git-mv to accept ./ in paths.
8812
Merge branch 'jc/mv' into next
8813
9801
Documentation: fix typo in rev-parse --short option description.
8814
9802
fmt-merge-msg: do not add excess newline at the end.
8815
Merge branch 'jc/merge-msg' into next
8816
Merge branch 'jc/mv'
8817
Merge branch 'jc/merge-msg'
8818
Merge branch 'js/portable' into next
8819
9803
rev-list --objects-edge
8820
Merge branch 'jc/rev-list' into next
8821
9804
Thin pack - create packfile with missing delta base.
8822
9805
send-pack --thin: use "thin pack" delta transfer.
8823
Merge branch 'jc/pack-thin' into next
8824
9806
Add git-push --thin.
8825
9807
Use thin pack transfer in "git fetch".
8826
Merge branch 'jc/pack-thin' into next
8827
9808
fmt-merge-msg: avoid open "-|" list form for Perl 5.6
8828
9809
rerere: avoid open "-|" list form for Perl 5.6
8829
9810
send-email: avoid open "-|" list form for Perl 5.6
8830
9811
svnimport: avoid open "-|" list form for Perl 5.6
8831
9812
cvsimport: avoid open "-|" list form for Perl 5.6
8832
Merge branch 'ra/anno' into next
8833
Merge branch 'jc/perl' into next
8834
9813
Fix fmt-merge-msg counting.
8835
9814
cherry-pick/revert: error-help message rewording.
8836
Merge branch 'jc/ident'
8837
Merge branch 'lt/merge-tree'
8838
9815
git-mktree: reverse of git-ls-tree.
8839
Merge part of jc/portable branch
8840
Merge branch 'pj/portable' into next
8841
Merge branch 'fk/blame' into next
8842
Merge branch 'pj/portable'
8843
Merge branch 'js/portable'
8844
Merge branch 'jc/nostat'
8845
Merge branch 'jc/pack-reuse'
8846
Merge branch 'jc/perl'
8847
Merge branch 'fix'
8848
Merge git://git.kernel.org/pub/scm/gitk/gitk
8849
Merge part of np/delta
8850
9816
rev-list.c: fix non-grammatical comments.
8851
9817
send-pack: do not give up when remote has insanely large number of refs.
8852
Merge branch 'jc/send-insane-refs' into next
8853
Merge branch 'ra/anno' into next
8854
Merge branch 'ml/cvs' into next
8855
9818
gitview: ls-remote invocation shellquote safety.
8856
Merge fixes up to GIT 1.2.3
8857
Merge master to get fixes up to GIT 1.2.3
8858
Merge branch 'cw/remove' into next
8859
Merge branch 'ra/anno'
8860
Merge branch 'ml/cvs'
8861
Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix-rename-leak' into next
8862
9819
pack-objects: thin pack micro-optimization.
8863
9820
pack-objects: use full pathname to help hashing with "thin" pack.
8864
9821
count-delta: tweak counting of copied source material.
8865
Merge branch 'np/delta' into next
8866
Merge part of pack-thin branch
8867
9822
count-delta: fix counting of copied source.
8868
9823
Tweak break/merge score to adjust to the new delta generation code.
8869
Merge branch 'ak/gitview'
8870
Merge fixes early for next maint series.
8871
Merge branch 'jc/send-insane-refs'
8872
Merge branch 'ar/win'
8873
9824
pack-objects: allow "thin" packs to exceed depth limits
8874
9825
rev-list --objects-edge: remove duplicated edge commit output.
8875
9826
rev-list --objects: use full pathname to help hashing.
8876
9827
pack-objects: hash basename and direname a bit differently.
8877
Merge fixes from master
8878
9828
Revert "diff-delta: produce optimal pack data"
8879
Merge branch 'np/delta' into next
8880
Merge fix bits from jc/rev-list
8881
Merge branches 'jc/rev-list' and 'jc/pack-thin' into next
8882
Merge fixes early for next maint series.
8883
Merge branch 'master' into next
8884
9829
Build and install git-mailinfo.
8885
Merge branches 'jc/rev-list' and 'jc/pack-thin'
8886
Merge branch 'master' into next
8887
Merge branches 'jc/rev-list' and 'jc/pack-thin'
8888
Merge branch 'master' into next
8889
Merge branch 'maint'
8890
Merge branch 'lt/rev-list' into next
8891
9830
rev-list split: minimum fixup.
8892
Merge branch 'lt/rev-list' into next
8893
9831
apply --whitespace fixes and enhancements.
8894
Merge branch 'lt/apply' into next
8895
Merge branch 'kh/svnimport' into next
8896
9832
apply: squelch excessive errors and --whitespace=error-all
8897
9833
apply --whitespace: configuration option.
8898
Merge part of kh/svnimport branch into master
8899
Merge branch 'kh/svnimport' into next
8900
Merge branch 'lt/apply' into next
8901
Merge branch 'lt/rev-list' into next
8902
Merge branch 'master' into next
8903
9834
git-apply --whitespace=nowarn
8904
9835
Revert "Revert "diff-delta: produce optimal pack data""
8905
9836
git-apply: war on whitespace -- finishing touches.
8906
Merge branch 'lt/apply' into next
8907
Merge part of np/delta
8908
9837
diffcore-break: micro-optimize by avoiding delta between identical files.
8909
9838
diffcore-rename: split out the delta counting code.
8910
9839
diffcore-delta: stop using deltifier for packing.
8911
9840
git-am: --whitespace=x option.
8912
Merge branch 'cvsserver' of http://locke.catalyst.net.nz/git/git-martinlanghoff; branch 'master' into next
8913
Merge branch 'js/refs' into next
8914
Merge branch 'lt/apply' into next
8915
Merge part of 'sp/checkout' into next
8916
Merge part of 'jc/diff' into next
8917
9841
diff-delta: cull collided hash bucket more aggressively.
8918
Merge branch 'lt/rev-list' into next
8919
9842
git-log (internal): add approxidate.
8920
9843
git-log (internal): more options.
8921
Merge branch 'lt/rev-list' into next
8922
Merge git-mv fixes from 'maint'
8923
Merge early parts of 'np/delta' branch
8924
Merge branch 'lt/apply'
8925
9844
Pretty-print tagger dates.
8926
Up to date with GIT 1.2.4 fixes
8927
Merge branch 'jc/diff' into next
8928
Pull GIT 1.2.4 fixes from master
8929
Merge branch 'jc/tag' into next
8930
Merge branch 'ml/cvsserver' into next
8931
Merge branch 'js/refs'
8932
Merge branch 'kh/svnimport'
8933
Merge branch 'np/delta' into next
8934
Merge part of 'jc/diff'
8935
Merge branch 'jc/tag'
8936
Merge branch 'ml/cvsserver' into next
8937
Merge branch 'maint'
8938
Merge branch 'master' into next
8939
9845
war on whitespaces: documentation.
8940
9846
Documentation: read-tree --aggressive
8941
9847
Documentation: rev-list --objects-edge
8942
9848
annotate: resurrect raw timestamps.
8943
Merge branch 'ml/cvsserver'
8944
Merge part of 'lt/rev-list' into 'fk/blame'
8945
9849
setup_revisions(): handle -n<n> and -<n> internally.
8946
9850
GIT-VERSION-GEN: squelch unneeded error from "cat version"
8947
9851
show-branch --topics
8948
9852
git-commit --amend
8949
9853
git-commit: make sure we protect against races.
8950
Merge branch 'jc/diff'
8951
Merge branch 'master' into next
8952
Merge branch 'lt/rev-list' into next
8953
Merge branch 'fk/blame' into next
8954
9854
diffcore-rename: similarity estimator fix.
8955
Merge branch 'jc/diff' into next
8956
Merge branch 'jc/delta' into next
8957
Merge branch 'cvsserver' of http://locke.catalyst.net.nz/git/git-martinlanghoff; branch 'ml/cvsserver' into next
8958
9855
show-branch --topics: omit more uninteresting commits.
8959
Merge branch 'tl/anno' into next
8960
Merge branch 'maint'
8961
Merge branch 'tl/anno'
8962
Merge branch 'master' into next
8963
Merge branch 'jc/diff' into next
8964
Merge branch 'lt/rev-list' into next
8965
Merge branch 'fk/blame' into next
8966
Merge part of 'sp/checkout'
8967
Merge tag 'ko-next' into next
8968
Merge branch 'lt/rev-list'
8969
Merge branch 'fk/blame'
8970
Merge branch 'master' into next
8971
9856
count-delta: no need for this anymore.
8972
9857
diffcore-break: similarity estimator fix.
8973
9858
diffcore-delta: make change counter to byte oriented again.
8974
Merge branch 'jc/diff' into next
8975
Merge branch 'master' into next
8976
Merge part of 'sp/checkout'
8977
Merge jc/diff leftover bits.
8978
Cauterize dropped or duplicate bits from next.
8979
Merge branch 'master' into next
8980
Merge branch 'jc/diff' into next
8981
9859
git-commit --amend: allow empty commit.
8982
Merge branch 'sp/checkout' into next
8983
9860
Const tightening.
8984
Merge branch 'master' into next
8985
9861
verify-pack -v: show delta-chain histogram.
8986
9862
blame: avoid -lm by not using log().
8987
9863
blame and annotate: show localtime with timezone.
8988
9864
blame: avoid "diff -u0".
8989
Merge part of 'jc/pack' into 'next'
8990
9865
annotate/blame tests updates.
8991
9866
annotate-blame test: don't "source", but say "."
8992
9867
annotate-blame test: add evil merge.
8993
Merge branch 'fd/asciidoc' into next
8994
9868
blame: unbreak "diff -U 0".
8995
9869
annotate-blame: tests incomplete lines.
8996
Merge branch 'master' into next
8997
9870
pack-objects: simplify "thin" pack.
8998
Merge branch 'fd/asciidoc'
8999
Merge branch 'jc/pack' into next
9000
Merge branch 'sp/checkout'
9001
Merge branch 'master' into next
9002
Merge branch 'master' into next
9003
9871
Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
9004
9872
refs.c::do_for_each_ref(): Finish error message lines with "\n"
9005
9873
fsck-objects: Remove --standalone
9006
Merge branch 'jc/fsck' into next
9007
9874
Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward message.
9008
9875
try_to_simplify_commit(): do not skip inspecting tree change at boundary.
9009
9876
repack: prune loose objects when -d is given
9010
Merge branch 'fk/blame' into next
9011
Merge branch 'ew/remote' into next
9012
Merge branch 'nh/http' into next
9013
9877
git-diff: -p disables rename detection.
9014
9878
diffcore-rename: somewhat optimized.
9015
Merge branch 'jc/diff' into next
9016
Merge branch 'master' into next
9017
9879
revision traversal: --remove-empty fix.
9018
Merge branch 'jc/empty' into next
9019
9880
revision traversal: --remove-empty fix (take #2).
9020
9881
diffcore-delta: make the hash a bit denser.
9021
Merge branch 'jc/empty' into next
9022
Merge branch 'jc/diff' into next
9023
9882
diffcore-delta: tweak hashbase value.
9024
Merge branch 'jc/diff' into next
9025
Merge branch 'jc/diff' into next
9026
Merge branch 'fk/blame'
9027
Merge branch 'nh/http'
9028
Merge branch 'jc/fsck'
9029
Merge branch 'jc/pack'
9030
Merge branch 'lt/diff' into next
9031
Merge branch 'master' into next
9032
Merge branch 'lt/diff' into next
9033
Merge branch 'master' into next
9034
9883
cvsimport: honor -i and non -i upon subsequent imports
9035
9884
fetch: exit non-zero when fast-forward check fails.
9036
Merge branch 'ew/abbrev' into next
9037
Merge branch 'jc/fetch' into next
9038
Merge branch 'jc/cvsimport' into next
9039
Merge branch 'master' into next
9040
Merge branch 'jc/empty'
9041
9885
cvsimport: fix reading from rev-parse
9042
Merge branch 'jc/cvsimport' into next
9043
9886
git-pull: run repo-config with dash form.
9044
Merge branch 'master' into next
9045
Merge branch 'master' into next
9046
9887
unpack_delta_entry(): reduce memory footprint.
9047
9888
generate-cmdlist: style cleanups.
9048
9889
revamp git-clone.
9049
9890
git-merge knows some strategies want to skip trivial merges
9050
Merge branch 'jc/clone' into next
9051
Merge branch 'jc/merge' into next
9052
9891
http-fetch: nicer warning for a server with unreliable 404 status
9053
9892
core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.
9054
9893
revamp git-clone (take #2).
9055
Merge branch 'jc/clone' into next
9056
Merge branch 'jc/name' into next
9057
9894
get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
9058
9895
clone: record the remote primary branch with remotes/$origin/HEAD
9059
Merge branch 'jc/name' into next
9060
Merge branch 'jc/clone' into next
9061
9896
http-push.c: squelch C90 warnings.
9062
9897
git-apply: do not barf when updating an originally empty file.
9063
9898
rev-list --timestamp
9064
9899
git-clone: typofix.
9065
Merge branch 'jc/clone' into next
9066
Merge branch 'jc/revlist' into next
9067
9900
git-pull: further safety while on tracking branch.
9068
9901
git-pull: reword "impossible to fast-forward" message.
9069
Merge branch 'jc/pull' into next
9070
9902
sha1_name: warning ambiguous refs.
9071
9903
sha1_name: make core.warnambiguousrefs the default.
9072
9904
send-email: Identify author at the top when sending e-mail
9073
Merge branch 'jc/fetch'
9074
Merge branch 'jc/pull'
9075
Merge branch 'jc/cvsimport'
9076
Merge branch 'jc/name' into next
9077
9905
commit-tree: check return value from write_sha1_file()
9078
9906
built-in diff: minimum tweaks
9079
Merge branch 'rs/tar-tree' into next
9080
Merge branch 'lt/diffgen' into next
9081
Merge branch 'ew/email' into next
9082
9907
true built-in diff: run everything in-core.
9083
Merge git://git.kernel.org/pub/scm/gitk/gitk
9084
Merge branch 'lt/diffgen' into next
9085
Merge branch 'jc/merge'
9086
Merge branches 'jc/clone' and 'jc/name'
9087
9908
git-push: make --thin pack transfer the default.
9088
Merge branch 'jc/thin' into next
9089
9909
add clean and ignore rules for xdiff/
9090
Merge branch 'master' into next
9091
Merge branch 'lt/diffgen' into next
9092
Merge branch ak/svn
9093
9910
GIT 1.3.0 rc1
9094
9911
9095
9912
Karl Hasselström (7):
9315
10132
git-mv: Allow -h without repo & fix error message
9316
10133
git-mv: fixes for path handling
9317
10134
9318
Junio C Hamano (16):
10135
Junio C Hamano (13):
9319
10136
checkout - eye candy.
9320
10137
Give no terminating LF to error() function.
9321
10138
diffcore-rename: plug memory leak.
9322
10139
git-am: do not allow empty commits by mistake.
9323
Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak' and 'ar/fix-win' into maint
9324
Merge branch 'fix' into maint
9325
10140
sample hooks template.
9326
10141
apply --whitespace fixes and enhancements.
9327
10142
apply: squelch excessive errors and --whitespace=error-all
9331
10146
git-am: --whitespace=x option.
9332
10147
diffcore-break: micro-optimize by avoiding delta between identical files.
9333
10148
Allow git-mv to accept ./ in paths.
9334
Merge branch 'lt/fix-apply' into maint
9335
10149
9336
10150
Linus Torvalds (1):
9337
10151
The war on trailing whitespace
9469
10283
Jon Loeliger (1):
9470
10284
Add --diff-filter= documentation paragraph
9471
10285
9472
Junio C Hamano (133):
10286
Junio C Hamano (112):
9473
10287
show-branch: take default arguments from configuration file.
9474
Merge fixes up to GIT 1.1.1
9475
10288
git-describe: default to HEAD
9476
10289
Makefile: add 'strip' target
9477
10290
octopus: allow criss-cross and clarify the message when it rejects
9478
10291
Fix the installation location.
9479
Merge fixes up to GIT 1.1.2
9480
10292
checkout: automerge local changes while switching branches.
9481
10293
checkout: merge local modifications while switching branches.
9482
10294
git-push: avoid falling back on pushing "matching" refs.
9487
10299
Documentation: show-branch.
9488
10300
show-branch: make the current branch and merge commits stand out.
9489
10301
show-branch: --current includes the current branch.
9490
Merge branches 'jc/checkout', 'jc/format-patch', 'jc/octopus', 'jc/sb' and 'jc/clone'
9491
10302
cvsimport: ease migration from CVSROOT/users format
9492
Merge branch 'fix'
9493
Merge fixes up to GIT 1.1.3
9494
10303
git-push: fix --tags and document it.
9495
10304
Allow building of RPM from interim snapshot.
9496
Merge fixes up to GIT 1.1.4
9497
10305
Revert "git-push: avoid falling back on pushing "matching" refs."
9498
10306
Makefile: do not assume lack of IPV6 means no sockaddr_storage.
9499
10307
fsck-objects: support platforms without d_ino in struct dirent.
9507
10315
git-clone: PG13 --naked option to --bare.
9508
10316
clone: do not create remotes/origin nor origin branch in a bare repository.
9509
10317
clone: do not accept more than one -o option.
9510
Merge branches 'jc/clone', 'md/env' and 'mo/path'
9511
10318
tests: adjust breakage by stricter rev-parse
9512
10319
git-fetch --upload-pack: disambiguate.
9513
Merge fixes up to GIT 1.1.5
9514
10320
merge: seed the commit message with list of conflicted files.
9515
10321
diff-tree -c: show a merge commit a bit more sensibly.
9516
10322
diff-tree --cc: denser combined diff output for a merge commit.
9530
10336
pretty_print_commit: honor grafts.
9531
10337
diff --abbrev=<n> option fix.
9532
10338
rev-parse: make "whatchanged -- git-fetch-script" work again.
9533
Merge lt/revlist,jc/diff,jc/revparse,jc/abbrev
9534
10339
diff-files -c/--cc: combine only when both ours and theirs exist.
9535
10340
Documentation: diff -c/--cc
9536
Merge fixes up to GIT 1.1.6
9537
10341
documentation: cvs migration - typofix.
9538
Merge branches 'bf/doc' and 'db/tartree'
9539
10342
update-index --index-info: allow stage 0 entries.
9540
10343
rev-list: omit duplicated parents.
9541
10344
combine-diff: reuse diff from the same blob.
9551
10354
whitespace cleanup.
9552
10355
get_sha1_1: allow octopus^12 to be properly parsed.
9553
10356
git-merge: Properly quote $merge_msg variable.
9554
Merge branches 'jc/sha1', 'jc/diff' and 'jc/ws'
9555
10357
Do not fall back on vi on dumb terminals.
9556
10358
diff-index: make --cc a synonym for -p for now.
9557
10359
git-diff: use --cc instead of -p.
9560
10362
daemon: extend user-relative path notation.
9561
10363
combine-diff: remove misguided --show-empty hack.
9562
10364
git-diff-tree --stdin: show all parents.
9563
Merge branches 'jc/daemon' and 'mw/http'
9564
Merge branches 'lt/show' and 'lt/revlist'
9565
Merge branch 'jc/diff'
9566
10365
git-diff: do not fall back on --cc when -[123], --ours etc. are given.
9567
10366
core-tutorial: adjust to recent reality.
9568
10367
combine-diff: do not send NULL to printf
9574
10373
git-rerere: reuse recorded resolve.
9575
10374
git-commit: revamp the git-commit semantics.
9576
10375
git-commit: finishing touches.
9577
Merge git://git.kernel.org/pub/scm/gitk/gitk
9578
10376
Do not allow empty name or email.
9579
10377
t6000: fix a careless test library add-on.
9580
10378
ls-files: honour per-directory ignore file from higher directories.
9582
10380
call git_config() after setup_git_directory()
9583
10381
combine-diff: move formatting logic to show_combined_diff()
9584
10382
count-delta.c: Match the delta data semantics change in version 3.
9585
Merge branch 'jc/ls-files-o'
9586
10383
git-status -v
9587
10384
find_unique_abbrev() simplification.
9588
10385
combine-diff: Record diff status a bit more faithfully
9589
Merge branch 'jc/empty-commit'
9590
10386
rev-list: default to abbreviate merge parent names under --pretty.
9591
10387
git-commit -v: have patch at the end.
9592
Merge branch 'lt/diff-tree'
9593
10388
Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values.
9594
10389
fetch-clone progress: finishing touches.
9595
10390
Only call git-rerere if $GIT_DIR/rr-cache exists.
9596
10391
t5500: adjust to change in pack-object reporting behaviour.
9597
10392
diff-tree: do not default to -c
9598
10393
Avoid using "git-var -l" until it gets fixed.
9599
Merge branch 'jc/fixdiff'
9600
Merge branch 'pb/repo'
9601
10394
hashtable-based objects: minimum fixups.
9602
10395
Make pack-objects chattier.
9603
10396
git-commit: show dirtiness including index.
9703
10496
J. Bruce Fields (1):
9704
10497
git push -f documentation
9705
10498
9706
Junio C Hamano (2):
10499
Junio C Hamano (1):
9707
10500
pre-commit sample hook: do not barf on the initial import
9708
GIT 1.1.6
9709
10501
9710
10502
9711
10503
Version v1.1.5; changes since v1.1.4:
9712
10504
-------------------------------------
9713
10505
9714
Junio C Hamano (3):
10506
Junio C Hamano (1):
9715
10507
checkout: do not make a temporary copy of symlink target.
9716
GIT 1.0.13
9717
GIT 1.1.5
9718
10508
9719
10509
9720
10510
Version v1.1.4; changes since v1.1.3:
9723
10513
Johannes Schindelin (1):
9724
10514
git-fetch-pack: really do not ask for funny refs
9725
10515
9726
Junio C Hamano (3):
10516
Junio C Hamano (1):
9727
10517
Revert "check_packed_git_idx(): check integrity of the idx file itself."
9728
GIT 1.0.12
9729
GIT 1.1.4
9730
10518
9731
10519
9732
10520
Version v1.1.3; changes since v1.1.2:
9733
10521
-------------------------------------
9734
10522
9735
Junio C Hamano (5):
10523
Junio C Hamano (2):
9736
10524
diffcore-break/diffcore-rename: integer overflow.
9737
GIT 1.0.11
9738
Merge branch 'fixo/1.0'
9739
10525
describe: omit clearing marks on the last one.
9740
GIT 1.1.3
9741
10526
9742
10527
9743
10528
Version v1.1.2; changes since v1.1.1:
9746
10531
J. Bruce Fields (1):
9747
10532
Documentation: clarify fetch parameter descriptions.
9748
10533
9749
Junio C Hamano (9):
9750
GIT 1.0.9
10534
Junio C Hamano (6):
9751
10535
update-index: work with c-quoted name
9752
10536
describe: do not silently ignore indescribable commits
9753
10537
name-rev: do not omit leading components of ref name.
9754
10538
show-branch: handle [] globs as well.
9755
10539
Documentation: git-commit -a
9756
10540
Documentation: git-reset - interrupted workflow.
9757
GIT 1.0.10
9758
GIT 1.1.2
9759
10541
9760
10542
Tom Prince (1):
9761
10543
Add git-describe to .gitignore.
9770
10552
Johannes Schindelin (1):
9771
10553
glossary: explain "master" and "origin"
9772
10554
9773
Junio C Hamano (2):
10555
Junio C Hamano (1):
9774
10556
GIT-VERSION-GEN: detect dirty tree and mark the version accordingly.
9775
GIT 1.1.1
9776
10557
9777
10558
9778
10559
Version v1.1.0; changes since v1.0.12:
9786
10567
John Ellson (1):
9787
10568
Make GIT-VERSION-GEN tolerate missing git describe command
9788
10569
9789
Junio C Hamano (33):
10570
Junio C Hamano (23):
9790
10571
Post 1.0.0 development track.
9791
Merge branch 'fixes'
9792
10572
Versioning scheme changes.
9793
10573
merge-recursive: conflicting rename case.
9794
Merge branch 'fixes'
9795
10574
whatchanged: customize diff-tree output
9796
Merge in fixes up to 1.0.3 maintenance branch.
9797
10575
rev-parse: --show-cdup
9798
10576
check_packed_git_idx(): check integrity of the idx file itself.
9799
10577
checkout: sometimes work from a subdirectory.
9800
10578
ls-tree: chomp leading directories when run from a subdirectory
9801
Adjust to ls-tree --full-name when run from a subdirectory.
9802
10579
git-clone: do not special case dumb http.
9803
Merge fixes up to GIT 1.0.4
9804
10580
Tutorial: mention shared repository management.
9805
Merge branch 'jc/checkout'
9806
Merge fixes up to GIT 1.0.5
9807
10581
git-describe: really prefer tags only.
9808
10582
git-describe: use find_unique_abbrev()
9809
10583
git-describe: --tags and --abbrev
9811
10585
git-describe: documentation.
9812
10586
Makefile: use git-describe to mark the git version.
9813
10587
send-pack/receive-pack: allow errors to be reported back to pusher.
9814
Merge fixes up to GIT 1.0.6
9815
Merge fixes up to GIT 1.0.7
9816
10588
git-fetch: auto-following tags.
9817
10589
ls-files --others --directory: fix a bug with index entry ordering
9818
10590
ls-files --others --directory: give trailing slash
9819
10591
git-status: use ls-files --others --directory for untracked list.
9820
10592
ls-files --others --directory: test
9821
10593
describe: allow more than one revs to be named.
9822
GIT 1.1.0
9823
10594
9824
10595
Linus Torvalds (2):
9825
10596
Add a "git-describe" command
9846
10617
Johannes Schindelin (1):
9847
10618
git-fetch-pack: really do not ask for funny refs
9848
10619
9849
Junio C Hamano (2):
10620
Junio C Hamano (1):
9850
10621
Revert "check_packed_git_idx(): check integrity of the idx file itself."
9851
GIT 1.0.12
9852
10622
9853
10623
9854
10624
Version v1.0.11; changes since v1.0.10:
9855
10625
---------------------------------------
9856
10626
9857
Junio C Hamano (2):
10627
Junio C Hamano (1):
9858
10628
diffcore-break/diffcore-rename: integer overflow.
9859
GIT 1.0.11
9860
10629
9861
10630
9862
10631
Version v1.0.10; changes since v1.0.9:
9865
10634
J. Bruce Fields (1):
9866
10635
Documentation: clarify fetch parameter descriptions.
9867
10636
9868
Junio C Hamano (6):
10637
Junio C Hamano (5):
9869
10638
update-index: work with c-quoted name
9870
10639
name-rev: do not omit leading components of ref name.
9871
10640
show-branch: handle [] globs as well.
9872
10641
Documentation: git-commit -a
9873
10642
Documentation: git-reset - interrupted workflow.
9874
GIT 1.0.10
9875
10643
9876
10644
9877
10645
Version v1.0.9; changes since v1.0.8:
9880
10648
Johannes Schindelin (1):
9881
10649
glossary: explain "master" and "origin"
9882
10650
9883
Junio C Hamano (1):
9884
GIT 1.0.9
9885
9886
10651
9887
10652
Version v1.0.8; changes since v1.0.7:
9888
10653
-------------------------------------
9890
10655
Joe English (1):
9891
10656
Substitute "/" with $opt_s in tag names as well as branch names
9892
10657
9893
Junio C Hamano (8):
10658
Junio C Hamano (7):
9894
10659
unpack-objects: default to quiet if stderr is not a tty.
9895
10660
Retire debian/ directory.
9896
10661
prune: do not show error from pack-redundant when no packs are found.
9898
10663
tar-tree: finish honoring extractor's umask in git-tar-tree.
9899
10664
revert/cherry-pick: handle single quote in author name.
9900
10665
mailsplit: allow empty input from stdin
9901
GIT 1.0.8
9902
10666
9903
10667
Yann Dirson (3):
9904
10668
Teach cvsexportcommit to add new files
9943
10707
git-init-db(1): Describe --shared and the idempotent nature of init-db
9944
10708
Wrap synopsis lines and use [verse] to keep formatting
9945
10709
9946
Junio C Hamano (7):
10710
Junio C Hamano (6):
9947
10711
Documentation: spell.
9948
10712
code comments: spell
9949
10713
?alloc: do not return NULL when asked for zero bytes
9950
10714
git-fetch --tags: reject malformed tags.
9951
10715
format-patch/commit: Quote single quote in the author name properly.
9952
10716
t3300: skip when filesystem does not like TAB in filenames.
9953
GIT 1.0.7
9954
10717
9955
10718
Linus Torvalds (1):
9956
10719
Fix nasty approxidate bug
9959
10722
Version v1.0.6; changes since v1.0.5:
9960
10723
-------------------------------------
9961
10724
9962
Junio C Hamano (4):
10725
Junio C Hamano (3):
9963
10726
Guard a test against wc that pads its output with whitespace
9964
10727
Fix bogus tests on rev-list output.
9965
10728
Do not mark tags fetched via --tags flag as mergeable
9966
GIT 1.0.6
9967
10729
9968
10730
Sam Ravnborg (1):
9969
10731
copy_fd: close ifd on error
9978
10740
Johannes Schindelin (1):
9979
10741
Handle symlinks graciously
9980
10742
9981
Junio C Hamano (3):
10743
Junio C Hamano (2):
9982
10744
avoid asking ?alloc() for zero bytes.
9983
10745
t5300: avoid false failures.
9984
GIT 1.0.5
9985
10746
9986
10747
9987
10748
Version v1.0.4; changes since v1.0.3:
9988
10749
-------------------------------------
9989
10750
9990
Junio C Hamano (6):
10751
Junio C Hamano (5):
9991
10752
check_packed_git_idx(): check integrity of the idx file itself.
9992
10753
show-branch: usability updates.
9993
10754
merge --no-commit: tweak message
9994
10755
ls-files --full-name: usage string and documentation.
9995
10756
mailinfo: iconv does not like "latin-1" -- should spell it "latin1"
9996
GIT 1.0.4
9997
10757
9998
10758
9999
10759
Version v1.0.3; changes since v1.0.0b:
10006
10766
git-format-patch should show the correct version
10007
10767
sha1_to_hex: properly terminate the SHA1
10008
10768
10009
Junio C Hamano (2):
10769
Junio C Hamano (1):
10010
10770
send-pack: reword non-fast-forward error message.
10011
GIT 1.0.3
10012
10771
10013
10772
Nick Hengeveld (1):
10014
10773
Fix for http-fetch from file:// URLs
10020
10779
Version v1.0.0b; changes since v1.0.0a:
10021
10780
---------------------------------------
10022
10781
10023
Junio C Hamano (2):
10782
Junio C Hamano (1):
10024
10783
server-info: skip empty lines.
10025
GIT 1.0.0b
10026
10784
10027
10785
Pavel Roskin (1):
10028
10786
quote.c: Make loop control more readable.
Loggerhead is a web-based interface for Breezy
Version: 2.0.1