1 Version v1.8.1.3; changes since v1.8.1.2:
2 -----------------------------------------
5 git-completion.bash: replace zsh notation that breaks bash 3.X
6 git-p4.py: support Python 2.5
7 git-p4.py: support Python 2.4
10 am: invoke perl's strftime in C locale
13 push: fix segfault when HEAD points nowhere
16 git-cvsimport.txt: cvsps-2 is deprecated
19 ident: do not drop username when reading from /etc/mailname
20 Makefile: explicitly set target name for autogenerated dependencies
23 Which merge_file() function do you mean?
24 merge-tree: lose unused "flags" from merge_list
25 merge-tree: lose unused "resolve_directories"
26 merge-tree: add comments to clarify what these functions are doing
27 merge-tree: fix d/f conflicts
28 Documentation: update "howto maintain git"
29 howto/maintain: mark titles for asciidoc
30 help: include <common-cmds.h> only in one file
31 t9902: protect test from stray build artifacts
32 howto/maintain: document "### match next" convention in jch/pu branch
33 README: update stale and/or incorrect information
34 INSTALL: git-p4 does not support Python 3
35 git-am: record full index line in the patch used while rebasing
36 apply: simplify build_fake_ancestor()
37 apply: diagnose incomplete submodule object name better
38 Start preparing for 1.8.1.3
41 Martin von Zweigbergk (2):
42 tests: move test_cmp_rev to test-lib-functions
43 learn to pick/revert into unborn branch
45 Nguyễn Thái Ngọc Duy (4):
46 attr: fix off-by-one directory component length calculation
47 test-lib.sh: unfilter GIT_PERF_*
48 attr: avoid calling find_basename() twice per path
49 branch: no detached HEAD check when editing another branch's description
52 rebase --preserve-merges: keep all merge commits including empty ones
54 Ramsay Allan Jones (1):
55 Makefile: Replace merge-file.h with merge-blobs.h in LIB_H
58 gpg: close stderr once finished with it in verify_signed_buffer()
60 Torsten Bögershausen (3):
61 t0050: known breakage vanished in merge (case change)
62 t0050: honor CASE_INSENSITIVE_FS in add (with different case)
63 t0050: Use TAB for indentation
66 Version v1.8.1.2; changes since v1.8.1.1:
67 -----------------------------------------
70 dir.c: Make git-status --ignored more consistent
71 git-status: Test --ignored behavior
72 status: always report ignored tracked directories
75 git-completion.bash: silence "not a valid object" errors
78 Remove the suggestion to use parsecvs, which is currently broken.
81 git-for-each-ref.txt: 'raw' is a supported date format
84 contrib/vim: simplify instructions for old vim support
87 Start preparing for 1.8.1.2
91 Prevent space after directories in tcsh completion
94 Introduce new static function real_path_internal()
95 real_path_internal(): add comment explaining use of cwd
96 Introduce new function real_path_if_valid()
97 longest_ancestor_length(): use string_list_split()
98 longest_ancestor_length(): take a string_list argument for prefixes
99 longest_ancestor_length(): require prefix list entries to be normalized
100 setup_git_directory_gently_1(): resolve symlinks in ceiling paths
101 string_list_longest_prefix(): remove function
103 Nguyễn Thái Ngọc Duy (1):
104 attr: make it build with DEBUG_ATTR again
106 Nickolai Zeldovich (1):
107 git-send-email: treat field names as case-insensitively
109 Peter Eisentraut (1):
110 git-commit-tree(1): correct description of defaults
113 archive-zip: write uncompressed size into header even with streaming
114 t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead
115 t0024, t5000: use test_lazy_prereq for UNZIP
116 t5000, t5003: move ZIP tests into their own script
117 t5003: check if unzip supports symlinks
119 Sebastian Staudt (1):
120 config.txt: Document help.htmlpath config parameter
123 Version v1.8.1.1; changes since v1.8.1:
124 ---------------------------------------
127 Use longer alias names in subdirectory tests
130 api-allocation-growing.txt: encourage better variable naming
133 merge: Honor prepare-commit-msg return code
135 Christian Couder (1):
136 Makefile: detect when PYTHON_PATH changes
139 Add directory pattern matching to attributes
142 run-command: drop silent_exec_failure arg from wait_or_whine
143 launch_editor: refactor to use start/finish_command
144 run-command: do not warn about child death from terminal
145 launch_editor: propagate signals from editor to git
146 completion: complete refs for "git commit -c"
147 refs: do not use cached refs in repack_without_ref
148 tests: turn on test-lint by default
149 fix compilation with NO_PTHREADS
150 run-command: encode signal death as a positive integer
153 clone: support atomic operation with --separate-git-dir
156 git-fast-import(1): remove duplicate '--done' option
157 git-shortlog(1): document behaviour of zero-width wrap
158 git-fast-import(1): combine documentation of --[no-]relative-marks
159 git-fast-import(1): reorganise options
162 config, gitignore: failure to access with ENOTDIR is ok
163 config: treat user and xdg config permission problems as errors
164 doc: advertise GIT_CONFIG_NOSYSTEM
165 config: exit on error accessing any config file
166 build: do not automatically reconfigure unless configure.ac changed
167 docs: manpage XML depends on asciidoc.conf
170 apply.c:update_pre_post_images(): the preimage can be truncated
171 format_commit_message(): simplify calls to logmsg_reencode()
172 sh-setup: work around "unset IFS" bug in some shells
173 fetch: ignore wildcarded refspecs that update local symbolic refs
174 xmkstemp(): avoid showing truncated template more carefully
175 t0200: "locale" may not exist
176 t9502: do not assume GNU tar
177 t4014: fix arguments to grep
178 t3600: Avoid "cp -a", which is a GNUism
179 t9020: use configured Python to run the test helper
180 compat/fnmatch: update old-style definition to ANSI
181 t9200: let "cvs init" create the test repository
182 merge --no-edit: do not credit people involved in the side branch
183 SubmittingPatches: who am I and who cares?
184 SubmittingPatches: mention subsystems with dedicated repositories
185 Documentation: full-ness of a bundle is significant for cloning
186 SubmittingPatches: remove overlong checklist
187 SubmittingPatches: give list and maintainer addresses
191 Kirill Brilliantov (1):
192 Documentation: correct example restore from bundle
195 Makefile: add comment on CYGWIN_V15_WIN32API
198 gitweb: Sort projects with undefined ages last
201 configure.ac: fix pthreads detection on Mac OS X
203 Michael Schubert (2):
204 git-subtree: ignore git-subtree executable
205 git-subtree: fix typo in manpage
207 Michał Kiedrowicz (1):
208 graph.c: infinite loop in git whatchanged --graph -m
210 Nguyễn Thái Ngọc Duy (4):
211 cache-tree: remove dead i-t-a code in verify_cache()
212 cache-tree: replace "for" loops in update_one with "while" loops
213 cache-tree: fix writing cache-tree when CE_REMOVE is present
214 cache-tree: invalidate i-t-a paths after generating trees
217 gitweb: fix error in sanitize when highlight is enabled
220 launch_editor: ignore terminal signals while editor has control
223 http.c: Avoid username prompt for certifcate credentials
226 archive-tar: split long paths more carefully
227 t1402: work around shell quoting issue on NetBSD
229 Sebastian Schuberth (1):
230 nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2
232 Steffen Prohaska (2):
233 shortlog: fix wrapping lines of wraplen
234 strbuf_add_wrapped*(): Remove unused return value
237 git-svn, perl/Git.pm: add central method for prompting passwords
238 perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set
239 git-svn, perl/Git.pm: extend and use Git->prompt method for querying users
241 Thomas Ackermann (1):
242 Remove Documentation/pt_BR/gittutorial.txt
244 Torsten Bögershausen (2):
245 t9810: Do not use sed -i
246 t9020: which is not portable
249 remote-hg: Fix biridectionality -> bidirectionality typos
252 Version v1.8.1; changes since v1.8.1-rc3:
253 -----------------------------------------
256 git(1): show link to contributor summary page
261 git-remote-helpers.txt: document invocation before input format
263 Ramkumar Ramachandra (1):
264 Documentation: move diff.wordRegex from config.txt to diff-config.txt
267 git-svn: Document branches with at-sign(@).
268 git-svn: Recommend use of structure options.
269 git-svn: Expand documentation for --follow-parent
270 git-svn: Note about tags.
273 make __git_ps1 accept a third parameter in pcmode
275 Thomas Ackermann (1):
276 Sort howto documents in howto-index.txt
279 Version v1.8.1-rc3; changes since v1.8.1-rc2:
280 ---------------------------------------------
283 SubmittingPatches: add convention of prefixing commit messages
284 Documentation: move support for old compilers to CodingGuidelines
287 Documentation/git-checkout.txt: clarify usage
288 Documentation/git-checkout.txt: document 70c9ac2 behavior
291 .mailmap: match up some obvious names/emails
292 .mailmap: fix broken entry for Martin Langhoff
293 .mailmap: normalize emails for Jeff King
294 .mailmap: normalize emails for Linus Torvalds
295 contrib: update stats/mailmap script
298 Documentation: don't link to example mail addresses
301 fetch --tags: clarify documentation
302 README: it does not matter who the current maintainer is
303 t7004: do not create unneeded gpghome/gpg.conf when GPG is not used
304 Documentation: Describe "git diff <blob> <blob>" separately
307 Nguyễn Thái Ngọc Duy (1):
308 index-format.txt: clarify what is "invalid"
311 git-svn: Document branches with at-sign(@).
312 git-svn: Recommend use of structure options.
313 git-svn: Expand documentation for --follow-parent
314 git-svn: Note about tags.
316 Sitaram Chamarty (1):
317 clarify -M without % symbol in diff-options
319 Stefano Lattarini (1):
320 README: Git is released under the GPLv2, not just "the GPL"
322 Thomas Ackermann (3):
323 Remove misleading date from api-index-skel.txt
324 Remove duplicate entry in ./Documentation/Makefile
325 Move ./technical/api-command.txt to ./howto/new-command.txt
328 Version v1.8.1-rc2; changes since v1.8.1-rc1:
329 ---------------------------------------------
332 git-prompt: Document GIT_PS1_DESCRIBE_STYLE
335 mingw: correct exit-code for SIGALRM's SIG_DFL
336 mingw: make fgetc raise SIGINT if apropriate
337 compat/terminal: factor out echo-disabling
338 compat/terminal: separate input and output handles
339 mingw: reuse tty-version of git_terminal_prompt
340 mingw: get rid of getpass implementation
341 mingw_rmdir: do not prompt for retry when non-empty
344 remote-testsvn: fix unitialized variable
347 git(1): remove a defunct link to "list of authors"
349 git-prompt.sh: update PROMPT_COMMAND documentation
350 git(1): show link to contributor summary page
354 git.txt: add missing info about --git-dir command-line option
357 Add file completion to tcsh git completion.
360 Fix sizeof usage in get_permutations
363 git-remote-helpers.txt: document invocation before input format
364 git-remote-helpers.txt: document missing capabilities
365 git-remote-helpers.txt: minor grammar fix
366 git-remote-helpers.txt: rearrange description of capabilities
367 git-remote-helpers.txt: clarify command <-> capability correspondences
368 git-remote-helpers.txt: clarify options & ref list attributes
370 Stefano Lattarini (1):
371 Makefile: whitespace style fixes in macro definitions
373 Sébastien Loriot (1):
374 Documentation/git-stash.txt: add a missing verb
376 Thomas Ackermann (1):
377 Renumber list in api-command.txt
380 Version v1.8.1-rc1; changes since v1.8.1-rc0:
381 ---------------------------------------------
384 l10n: Update git.pot (5 new, 1 removed messages)
387 Update draft release notes to 1.8.0.2
388 Documentation/diff-config: work around AsciiDoc misfortune
392 document that statusHints affects git checkout
395 l10n: Update Swedish translation (1979t0f0u)
398 l10n: de.po: translate 825 new messages
399 l10n: de.po: translate 22 new messages
401 Ramkumar Ramachandra (4):
402 t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs
403 t4041 (diff-submodule-option): parse digests sensibly
404 t4041 (diff-submodule-option): rewrite add_file() routine
405 t4041 (diff-submodule-option): modernize style
408 l10n: vi.po: update to git-v1.8.0.1-347-gf94c3
411 Version v1.8.1-rc0; changes since v1.8.0.3:
412 -------------------------------------------
415 Use character class for sed expression instead of \s
418 usage.c: detect recursion in die routines and bail out immediately
421 git-cvsimport: allow author-specific timezones
424 vcs-svn: add fast_export_note to create notes
427 emacs: make 'git-status' work with separate git dirs
430 Documentation: how to add a new command
432 Felipe Contreras (32):
433 completion: add format-patch options to send-email
434 Add new remote-hg transport helper
435 remote-hg: add support for pushing
436 remote-hg: add support for remote pushing
437 remote-hg: add support to push URLs
438 remote-hg: make sure the encoding is correct
439 remote-hg: match hg merge behavior
440 remote-hg: add support for hg-git compat mode
441 remote-hg: add compat for hg-git author fixes
442 remote-hg: fake bookmark when there's none
443 remote-hg: add basic tests
444 test-lib: avoid full path to store test results
445 remote-hg: add bidirectional tests
446 remote-hg: add tests to compare with hg-git
447 remote-hg: add extra author test
448 remote-hg: add option to not track branches
449 remote-hg: the author email can be null
450 remote-hg: fix compatibility with older versions of hg
451 remote-hg: try the 'tip' if no checkout present
452 remote-hg: avoid bad refs
453 completion: add comment for test_completion()
454 completion: standardize final space marker in tests
455 completion: simplify tests using test_completion_long()
456 completion: consolidate test_completion*() tests
457 completion: refactor __gitcomp related tests
458 completion: simplify __gitcomp() test helper
459 completion: add new zsh completion
460 completion: start moving to the new zsh completion
461 send-email: avoid questions when user has an ident
462 remote-hg: fix for files with spaces
463 remote-hg: fix for older versions of python
464 completion: fix warning for zsh
466 Florian Achleitner (15):
467 Implement a remote helper for svn in C
468 Add git-remote-testsvn to Makefile
469 Add svndump_init_fd to allow reading dumps from arbitrary FDs
470 Add argv_array_detach and argv_array_free_detached
471 Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability
472 Add documentation for the 'bidi-import' capability of remote-helpers
473 When debug==1, start fast-import with "--stats" instead of "--quiet"
474 remote-svn, vcs-svn: Enable fetching to private refs
475 Allow reading svn dumps from files via file:// urls
476 Create a note for every imported commit containing svn metadata
477 remote-svn: Activate import/export-marks for fast-import
478 remote-svn: add incremental import
479 Add a svnrdump-simulator replaying a dump file for testing
480 remote-svn: add marks-file regeneration
481 Add a test script for remote-svn
484 pager: drop "wait for output to run less" hack
485 peel_ref: use faster deref_tag_noverify
486 peel_ref: do not return a null sha1
487 peel_ref: check object type before loading
488 upload-pack: use peel_ref for ref advertisements
489 remote-curl: do not call run_slot repeatedly
490 http: do not set up curl auth after a 401
491 strbuf: always return a non-NULL value from strbuf_detach
492 status: add --long output format option
493 git-sh-setup: refactor ident-parsing functions
494 filter-branch: use git-sh-setup's ident parsing functions
496 t1300: remove redundant test
497 t1300: test "git config --get-all" more thoroughly
498 git-config: remove memory leak of key regexp
499 git-config: fix regexp memory leaks on error conditions
500 git-config: collect values instead of immediately printing
501 git-config: do not complain about duplicate entries
502 git-config: use git_config_with_options
503 remote-curl: hoist gzip buffer size to top of post_rpc
504 remote-curl: retry failed requests for auth even with gzip
505 cvsimport: work around perl tzset issue
506 test-lib: allow negation of prerequisites
507 t7502: factor out autoident prerequisite
508 ident: make user_ident_explicitly_given static
509 ident: keep separate "explicit" flags for author and committer
510 diff: rename "set" variable
511 t: add tests for "git var"
512 t9001: check send-email behavior with implicit sender
513 status: respect advice.statusHints for ahead/behind advice
516 diff: diff.context configuration gives default to -U
519 submodule: teach rm to remove submodules unless they contain a git directory
520 Teach "git submodule add" the --name option
521 submodule add: Fail when .git/modules/<name> already exists unless forced
522 submodule status: remove unused orig_* variables
523 Teach rm to remove submodules when given with a trailing '/'
526 l10n: Update git.pot (14 new, 3 removed messages)
529 fix 'make test' for HP NonStop
532 git symbolic-ref --delete $symref
535 maybe_flush_or_die: move a too-loose Windows specific error
538 t4055: avoid use of sed 'a' command
539 log --grep: accept --basic-regexp and --perl-regexp
540 log: honor grep.* configuration
541 coloured git-prompt: paint detached HEAD marker in red
542 pretty: remove reencode_commit_message()
543 format_note(): simplify API
544 pretty: prepare notes message at a centralized place
545 pretty_print_commit(): do not append notes message
546 format-patch: append --signature after notes
547 format-patch --notes: show notes after three-dashes
548 Documentation: decribe format-patch --notes
549 get_fetch_map(): tighten checks on dest refs
550 format-patch: add a blank line between notes and diffstat
552 Sixth batch for 1.8.1
553 Update draft release notes for 1.8.1
554 Update draft release notes to 1.8.1
555 Update draft release notes to 1.8.1
556 Update draft release notes to 1.8.1
560 update-index/diff-index: use core.preloadindex to improve performance
562 Krzysztof Mazur (10):
563 git-send-email: introduce compose-encoding
564 git-send-email: use compose-encoding for Subject
565 git-send-email: skip RFC2047 quoting for ASCII subjects
566 git-send-email: introduce quote_subject()
567 git-send-email: add rfc2047 quoting for "=?"
568 git-send-email: remove garbage after email address
569 git-send-email: fix fallback code in extract_valid_address()
570 git-send-email: remove invalid addresses earlier
571 git-send-email: ask what to do with an invalid email address
572 git-send-email: allow edit invalid email address
575 tcsh-completion re-using git-completion.bash
576 Support for git aliasing for tcsh completion
579 Update cygwin.c for new mingw-64 win32 api headers
580 USE CGYWIN_V15_WIN32API as macro to select api for cygwin
583 docs: move submodule section
585 Matthew Ogilvie (10):
586 cvsserver t9400: add basic 'cvs log' test
587 cvsserver: removed unused sha1Or-k mode from kopts_from_path
588 cvsserver: add comments about database schema/usage
589 cvsserver update: comment about how we shouldn't remove a user-modified file
590 cvsserver: remove unused functions _headrev and gethistory
591 cvsserver: clean up client request handler map comments
592 cvsserver: split up long lines in req_{status,diff,log}
593 cvsserver: use whole CVS rev number in-process; don't strip "1." prefix
594 cvsserver: cvs add: do not expand directory arguments
595 cvsserver status: provide real sticky info
598 status: add advice on how to push/pull to tracking branch
600 Michael Haggerty (12):
601 parse_dirstat_params(): use string_list to split comma-separated string
602 strbuf_split_buf(): use ALLOC_GROW()
603 strbuf_split_buf(): simplify iteration
604 strbuf_split*(): rename "delim" parameter to "terminator"
605 strbuf_split*(): document functions
606 string_list: add a function string_list_remove_empty_items()
607 Initialize sort_uniq_list using named constant
608 combine_notes_cat_sort_uniq(): sort and dedup lines all at once
609 notes: fix handling of colon-separated values
610 string_list_add_refs_from_colon_sep(): use string_list_split()
611 link_alt_odb_entries(): use string_list_split_in_place()
612 link_alt_odb_entries(): take (char *, len) rather than two pointers
614 Michael J Gruber (1):
615 replace: parse revision argument for -d
617 Nguyễn Thái Ngọc Duy (16):
618 attr: avoid strlen() on every match
619 attr: avoid searching for basename on every match
620 exclude: stricten a length check in EXC_FLAG_ENDSWITH case
621 exclude: split basename matching code into a separate function
622 exclude: fix a bug in prefix compare optimization
623 exclude: split pathname matching code into a separate function
624 gitignore: make pattern parsing code a separate function
625 attr: more matching optimizations from .gitignore
626 tree-walk: use enum interesting instead of integer
627 Move try_merge_command and checkout_fast_forward to libgit.a
628 Move estimate_bisect_steps to libgit.a
629 Move print_commit_list to libgit.a
630 Move setup_diff_pager to libgit.a
631 send-pack: move core code to libgit.a
632 fetch-pack: remove global (static) configuration variable "args"
633 fetch-pack: move core code to libgit.a
636 Documentation: improve the example of overriding LESS via core.pager
639 git p4: catch p4 describe errors
640 git p4: handle servers without move support
641 git p4: catch p4 errors when streaming file contents
642 git p4 test: display unresolvable host error
643 git p4: fix labelDetails typo in exception
644 git p4: remove unneeded cmd initialization
647 l10n: Update Swedish translation (1975t0f0u)
650 t7407: Fix recursive submodule test
651 Teach --recursive to submodule sync
652 Add tests for submodule sync --recursive
655 gitweb: make remote_heads config setting work
658 Doc SubmittingPatches: Mention --notes option after "cover letter"
659 Doc notes: Include the format-patch --notes option
660 Doc format-patch: clarify --notes use case
661 Doc User-Manual: Patch cover letter, three dashes, and --notes
663 Ramkumar Ramachandra (4):
664 remote-hg: add missing config for basic tests
665 Documentation: move diff.wordRegex from config.txt to diff-config.txt
666 diff: introduce diff.submodule configuration variable
667 submodule: display summary header in bold
669 Ramsay Allan Jones (2):
670 builtin/config.c: Fix a sparse warning
671 remote-curl.c: Fix a compiler warning
674 completion: remove 'help' duplicate from porcelain commands
677 Allow __git_ps1 to be used in PROMPT_COMMAND
678 show color hints based on state of the git tree
679 Fix up colored git-prompt
682 submodule add: fix handling of --reference=<repo> option
684 Stefano Lattarini (1):
685 configure: fix some output message
687 Torsten Bögershausen (1):
688 Fix t9200 on case insensitive file systems
691 l10n: vi.po: update to git-v1.7.12-437-g1084f
692 l10n: vi.po: Update follow git-v1.8.0-273-g2d242
695 Version v1.8.0.3; changes since v1.8.0.2:
696 -----------------------------------------
699 SubmittingPatches: add convention of prefixing commit messages
700 Documentation: move support for old compilers to CodingGuidelines
703 git-prompt: Document GIT_PS1_DESCRIBE_STYLE
706 Documentation/git-checkout.txt: clarify usage
707 Documentation/git-checkout.txt: document 70c9ac2 behavior
709 Gunnlaugur Þór Briem (1):
710 Document git-svn fetch --log-window-size parameter
713 pickaxe: hoist empty needle check
714 pickaxe: use textconv for -S counting
715 .mailmap: match up some obvious names/emails
716 .mailmap: fix broken entry for Martin Langhoff
717 .mailmap: normalize emails for Jeff King
718 .mailmap: normalize emails for Linus Torvalds
719 contrib: update stats/mailmap script
722 Documentation: don't link to example mail addresses
725 fetch --tags: clarify documentation
726 README: it does not matter who the current maintainer is
727 t7004: do not create unneeded gpghome/gpg.conf when GPG is not used
728 Documentation: Describe "git diff <blob> <blob>" separately
729 git(1): show link to contributor summary page
733 doc: git-reset: make "<mode>" optional
736 git.txt: add missing info about --git-dir command-line option
739 Fix sizeof usage in get_permutations
742 git-remote-helpers.txt: document invocation before input format
744 Nguyễn Thái Ngọc Duy (1):
745 index-format.txt: clarify what is "invalid"
747 Ramkumar Ramachandra (1):
748 Documentation: move diff.wordRegex from config.txt to diff-config.txt
751 git-svn: Document branches with at-sign(@).
752 git-svn: Recommend use of structure options.
753 git-svn: Expand documentation for --follow-parent
754 git-svn: Note about tags.
756 Sitaram Chamarty (1):
757 clarify -M without % symbol in diff-options
759 Stefano Lattarini (1):
760 README: Git is released under the GPLv2, not just "the GPL"
762 Thomas Ackermann (8):
763 Split over-long synopsis in git-fetch-pack.txt into several lines
764 Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
765 Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt
766 Documentation/technical: convert plain text files to asciidoc
767 Documentation/howto: convert plain text files to asciidoc
768 Documentation: build html for all files in technical and howto
769 Remove misleading date from api-index-skel.txt
770 Sort howto documents in howto-index.txt
773 Add -S, --gpg-sign option to manpage of "git commit"
776 Version v1.8.0.2; changes since v1.8.0.1:
777 -----------------------------------------
780 Fix typo in remote set-head usage
783 doc/fast-import: clarify how content states are built
786 t1400-update-ref: Add test verifying bug with symrefs in delete_ref()
787 Fix failure to delete a packed ref through a symref
790 reencode_string(): introduce and use same_encoding()
791 test: add failing tests for "diff --stat" to t4049
792 diff --stat: status of unmodified pair in diff-q is not zero
793 diff --stat: use "file" temporary variable to refer to data->files[i]
794 diff --stat: move the "total count" logic to the last loop
795 diff --stat: do not count "unmerged" entries
796 diff --shortstat: do not count "unmerged" entries
797 Documentation/git-push.txt: clarify the "push from satellite" workflow
798 Start preparing for 1.8.0.2
800 Update draft release notes to 1.8.0.2
801 git(1): remove a defunct link to "list of authors"
805 Fix "git diff --stat" for interesting - but empty - file changes
808 Documentation: improve phrasing in git-push.txt
811 git-remote-mediawiki: escape ", \, and LF in file names
812 git-fast-import.txt: improve documentation for quoted paths
814 Nguyễn Thái Ngọc Duy (1):
815 compat/fnmatch: fix off-by-one character class's length check
818 Makefile: hide stderr of curl-config test
821 git p4: RCS expansion should not span newlines
824 completion: add options --single-branch and --branch to "git clone"
827 gitweb.perl: fix %highlight_ext mappings
829 Sébastien Loriot (1):
830 Documentation/git-stash.txt: add a missing verb
833 git-submodule: wrap branch option with "<>" in usage strings.
836 Version v1.8.0.1; changes since v1.8.0:
837 ---------------------------------------
840 commit: fixup misplacement of --no-post-rewrite description
843 Remove the hard coded length limit on variable names in config files
845 Carlos Martín Nieto (1):
846 config: don't segfault when given --path with a missing value
849 mergetools/p4merge: Handle "/dev/null"
851 Jan H. Schönherr (7):
852 utf8: fix off-by-one wrapping of text
853 format-patch: do not wrap non-rfc2047 headers too early
854 format-patch: do not wrap rfc2047 encoded headers too late
855 format-patch: introduce helper function last_line_length()
856 format-patch: make rfc2047 encoding more strict
857 format-patch: fix rfc2047 address encoding with respect to rfc822 specials
858 format-patch tests: check quoting/encoding in To: and Cc: headers
861 diff_grep: use textconv buffers for add/deleted files
862 gitweb: escape html in rss title
863 checkout: print a message when switching unborn branches
866 builtin/grep.c: make configuration callback more reusable
867 grep: move the configuration parsing logic to grep.[ch]
868 grep: move pattern-type bits support to top-level grep.[ch]
869 revisions: initialize revs->grep_filter using grep_init()
870 log --grep: use the same helper to set -E/-F options as "git grep"
871 test-lib: Fix say_color () not to interpret \a\b\c in the message
872 Start preparing for 1.8.0.1
873 Further preparation for 1.8.0.1
877 Completion must sort before using uniq
880 Documentation: remote tracking branch -> remote-tracking branch
881 Document 'git commit --no-edit' explicitly
883 Michael J Gruber (1):
884 push/pull: adjust missing upstream help text to changed interface
886 Nguyễn Thái Ngọc Duy (1):
887 grep: stop looking at random places for .gitattributes
890 git-pull: Avoid merge-base on detached head
893 Doc repository-layout: Show refs/replace
896 refs: lock symref that is to be deleted, not its target
897 branch: factor out check_branch_commit()
898 branch: factor out delete_branch_config()
899 branch: delete symref branch, not its target
900 branch: skip commit checks when deleting symref branches
901 branch: show targets of deleted symrefs, not sha1s
903 Romain Francoise (1):
904 mailmap: avoid out-of-bounds memory access
907 Fix potential hang in https handshake
910 Version v1.8.0; changes since v1.8.0-rc3:
911 -----------------------------------------
914 git-gui: Detect full path when parsing arguments
915 git-gui: Don't prepend the prefix if value looks like a full path
918 git-gui: Fix a loose/lose mistake
919 git-gui: remove .git/CHERRY_PICK_HEAD after committing
921 Benjamin Kerensa (1):
922 git-gui: fix a typo in po/ files
924 Clemens Buchacher (1):
925 git-gui: fix git-gui crash due to uninitialized variable
928 git-gui: open console when using --trace on windows
934 git-gui: Use PWD if it exists on Mac OS X
937 git-gui: preserve commit messages in utf-8
941 git-gui: de.po: consistently add untranslated hook names within braces
942 git-gui: de.po: translate "bare" as "bloß"
943 git-gui: de.po: translate "remote" as "extern"
945 Vitaly _Vi Shukela (1):
946 git-gui: Fix semi-working shortcuts for unstage and revert
949 Version v1.8.0-rc3; changes since v1.8.0-rc2:
950 ---------------------------------------------
952 Dylan Alex Simon (1):
953 gitweb.cgi: fix "comitter_tz" typo in feed
956 http: fix segfault in handle_curl_result
959 l10n: Update git.pot (3 new, 6 removed messages)
962 Update draft release notes to 1.8.0
967 l10n: Update Swedish translation (1964t0f0u)
970 Fix spelling error in post-receive-email hook
972 Thomas Ackermann (1):
973 Documentation/RelNotes: remove "updated up to this revision" markers
976 l10n: vi.po: update translation upto cc76011
977 l10n: vi.po: update from v1.8.0-rc2-4-g42e55
980 Version v1.8.0-rc2; changes since v1.8.0-rc1:
981 ---------------------------------------------
984 tests: "cp -a" is a GNUism
987 git svn: work around SVN 1.7 mishandling of svn:special changes
988 svn test: escape peg revision separator using empty peg rev
991 gitcli: parse-options lets you omit tail of long options
994 Nguyễn Thái Ngọc Duy (2):
995 gitignore.txt: suggestions how to get literal # or ! at the beginning
996 attr: a note about the order of .gitattributes lookup
998 Ramkumar Ramachandra (1):
999 Git url doc: mark ftp/ftps as read-only and deprecate them
1001 Ramsay Allan Jones (1):
1002 MALLOC_CHECK: Allow checking to be disabled from config.mak
1005 l10n: de.po: fix a few minor typos
1008 configure.ac: Add missing comma to CC_LD_DYNPATH
1011 Version v1.8.0-rc1; changes since v1.8.0-rc0:
1012 ---------------------------------------------
1015 Make git-svn branch patterns match complete URL
1018 git-svn: use path accessor for Git::SVN objects
1020 Jonathan Nieder (2):
1021 Git::SVN: rename private path field
1022 git-svn: keep leading slash when canonicalizing paths (fallback case)
1025 log --grep-reflog: reject the option without -g
1026 Start preparing for 1.7.12.3
1027 t1450: the order the objects are checked is undefined
1028 Update draft release notes to 1.8.0
1029 paint_down_to_common(): parse commit before relying on its timestamp
1034 mailinfo: don't require "text" mime type for attachments
1036 Michael J Gruber (1):
1037 RelNotes/1.8.0: various typo and style fixes
1039 Nguyễn Thái Ngọc Duy (3):
1040 grep: prepare for new header field filter
1041 revision: add --grep-reflog to filter commits by reflog messages
1042 revision: make --grep search in notes too if shown
1045 l10n: Fix to Swedish translation
1047 Ramkumar Ramachandra (1):
1048 Documentation: mention `push.default` in git-push.txt
1051 t9164: Add missing quotes in test
1054 git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip
1055 git-svn.perl: keep processing all commits in parents_exclude
1058 silence git gc --auto --quiet output
1061 Version v1.8.0-rc0; changes since v1.7.12.4:
1062 --------------------------------------------
1065 Add userdiff patterns for Ada
1068 rebase -i: Refactor help messages for todo file
1069 rebase -i: Teach "--edit-todo" action
1070 rebase -i: Add tests for "--edit-todo"
1073 gitk: Fix GIT_TRACE issues
1075 Carlos Martín Nieto (4):
1076 branch: introduce --set-upstream-to
1077 branch: add --unset-upstream option
1078 branch: deprecate --set-upstream and show help if we detect possible mistaken use
1079 completion: add --set-upstream-to and --unset-upstream
1082 cherry-pick: add --allow-empty-message option
1085 difftool: Simplify print_tool_help()
1086 difftool: Eliminate global variables
1087 difftool: Move option values into a hash
1088 difftool: Call the temp directory "git-difftool"
1089 difftool: Use symlinks when diffing against the worktree
1090 difftool: Handle finding mergetools/ in a path with spaces
1091 difftool: Check all return codes from compare()
1092 difftool: Wrap long lines for readability
1093 difftool: Handle compare() returning -1
1094 difftool: Disable --symlinks on cygwin
1095 mergetool,difftool: Document --tool-help consistently
1096 mergetool--lib: Allow custom commands to override built-ins
1099 Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption
1102 contrib: add win32 credential-helper
1105 grep: add a grep.patternType configuration setting
1108 remote-curl: rename is_http variable
1109 remote-curl: let users turn off smart http
1110 t9902: add a few basic completion tests
1111 t9902: add completion tests for "odd" filenames
1114 Fix tests under GETTEXT_POISON on relative dates
1115 Fix tests under GETTEXT_POISON on git-stash
1116 Fix tests under GETTEXT_POISON on diffstat
1117 Fix tests under GETTEXT_POISON on git-apply
1118 Fix tests under GETTEXT_POISON on pack-object
1119 Fix tests under GETTEXT_POISON on git-remote
1120 Fix tests under GETTEXT_POISON on parseopt
1121 l10n: Update git.pot (2 new, 4 removed messages)
1122 l10n: zh_CN.po: translate 2 new messages
1123 l10n: Update git.pot (825 new, 24 removed messages)
1124 l10n: zh.CN.po: msgmerge git.pot (1142t195f630u)
1126 Joachim Schmitz (8):
1127 compat: some mkdir() do not like a slash at the end
1128 Add a no-op setitimer() wrapper
1129 Document MKDIR_WO_TRAILING_SLASH in Makefile
1130 make poll available for other platforms lacking it
1131 fix some win32 specific dependencies in poll.c
1132 poll() exits too early with EFAULT if 1st arg is NULL
1133 make poll() work on platforms that can't recv() on a non-socket
1137 t0060: split absolute path test in two to exercise some of it on Windows
1138 rebase -i: fix misleading error message after 'exec no-such' instruction
1139 rebase -i: suggest using --edit-todo to fix an unknown instruction
1141 Junio C Hamano (42):
1142 daemon: --access-hook option
1143 Kick off cycle towards 1.8.0
1144 First half of the second batch for 1.8.0
1145 in_merge_bases(): support only one "other" commit
1146 receive-pack: use in_merge_bases() for fast-forward check
1147 http-push: use in_merge_bases() for fast-forward check
1148 Latter half of the second batch for 1.8.0
1149 merge_bases_many(): split out the logic to paint history
1150 in_merge_bases(): use paint_down_to_common()
1151 get_merge_bases_many(): walk from many tips in parallel
1152 merge-base: "--is-ancestor A B"
1153 reduce_heads(): reimplement on top of remove_redundant()
1154 The third batch for 1.8.0
1155 Update mailmap for a handful of folks
1156 The fourth batch for 1.8.0
1157 Cull items fixed in maintenance branches
1158 First half of the fifth batch for 1.8.0
1159 Second half of the fifth batch for 1.8.0
1160 Start merging the sixth batch for 1.8.0
1161 The sixth batch for 1.8.0
1162 Draft release notes to 1.8.0
1163 builtin/notes.c: mark file-scope private symbols as static
1164 commit.c: mark a file-scope private symbol as static
1165 diff.c: mark a private file-scope symbol as static
1166 graph.c: mark private file-scope symbols as static
1167 rerere.c: mark private file-scope symbols as static
1168 notes.c: mark a private file-scope symbol as static
1169 symlinks.c: mark private file-scope symbols as static
1170 sha1-array.c: mark a private file-scope symbol as static
1171 strbuf.c: mark a private file-scope symbol as static
1172 read-cache.c: mark a private file-scope symbol as static
1173 wt-status.c: mark a private file-scope symbol as static
1174 trace.c: mark a private file-scope symbol as static
1175 ident.c: mark private file-scope symbols as static
1176 sequencer.c: mark a private file-scope symbol as static
1177 The seventh batch for 1.8.0
1178 MALLOC_CHECK: various clean-ups
1179 Revert "archive-zip: support UTF-8 paths"
1180 Update draft release notes to 1.8.0
1181 Update draft release notes to 1.8.0
1182 Update draft release notes to 1.8.0
1186 cvsimport: strip all inappropriate tag strings
1189 commit/commit-tree: correct latin1 to utf-8
1191 Martin von Zweigbergk (4):
1192 remove unnecessary parameter from get_patch_ids()
1193 cherry: don't set ignored rev_info options
1194 cherry: remove redundant check for merge commit
1195 rebase usage: subcommands can not be combined with -i
1198 push: start warning upcoming default change for push.default
1200 Michael G. Schwern (20):
1201 Git::SVN: use accessors internally for path
1202 Git::SVN: use accessor for URLs internally
1203 Git::SVN::Ra: use accessor for URLs
1204 use Git::SVN->path accessor globally
1205 use Git::SVN{,::RA}->url accessor globally
1206 git-svn: move canonicalization to Git::SVN::Utils
1207 git-svn: use SVN 1.7 to canonicalize when possible
1208 git-svn: factor out _collapse_dotdot function
1209 git-svn: add join_paths() to safely concatenate paths
1210 Git::SVN::Utils: remove irrelevant comment
1211 git-svn: path canonicalization uses SVN API
1212 Git::SVN{,::Ra}: canonicalize earlier
1213 t9118: workaround inconsistency between SVN versions
1215 git-svn: attempt to mimic SVN 1.7 URL canonicalization
1216 git-svn: replace URL escapes with canonicalization
1217 git-svn: canonicalize earlier
1218 git-svn: introduce add_path_to_url function
1219 git-svn: canonicalize newly-minted URLs
1220 git-svn: remove ad-hoc canonicalizations
1222 Michael Haggerty (29):
1223 t0060: move tests of real_path() from t0000 to here
1224 t0060: verify that absolute_path() fails if passed the empty string
1225 absolute_path(): reject the empty string
1226 t0060: verify that real_path() fails if passed the empty string
1227 real_path(): reject the empty string
1228 t0060: verify that real_path() works correctly with absolute paths
1229 real_path(): properly handle nonexistent top-level paths
1230 t0060: verify that real_path() removes extra slashes
1231 string_list: add function string_list_append_nodup()
1232 string_list: add two new functions for splitting strings
1233 string_list: add a new function, filter_string_list()
1234 string_list: add a new function, string_list_remove_duplicates()
1235 string_list: add a function string_list_longest_prefix()
1236 api-string-list.txt: initialize the string_list the easy way
1237 t5500: add tests of error output for missing refs
1238 t5500: add tests of fetch-pack --all --depth=N $URL $REF
1239 Rename static function fetch_pack() to http_fetch_pack()
1240 fetch_pack(): reindent function decl and defn
1241 Change fetch_pack() and friends to take string_list arguments
1242 filter_refs(): do not check the same sought_pos twice
1243 fetch_pack(): update sought->nr to reflect number of unique entries
1244 filter_refs(): delete matched refs from sought list
1245 filter_refs(): build refs list as we go
1246 filter_refs(): simplify logic
1247 cmd_fetch_pack(): return early if finish_connect() fails
1248 fetch-pack: report missing refs even if no existing refs were received
1249 cmd_fetch_pack(): simplify computation of return value
1250 fetch-pack: eliminate spurious error messages
1251 string_list API: document what "sorted" means
1253 Michael J Gruber (1):
1254 completion: complete branch name for "branch --set-upstream-to="
1257 cherry-pick: don't forget -s on failure
1259 Nguyễn Thái Ngọc Duy (74):
1260 i18n: mark "style" in OPT_COLUMN() for translation
1261 i18n: archive: mark parseopt strings for translation
1262 i18n: bisect--helper: mark parseopt strings for translation
1263 i18n: add: mark parseopt strings for translation
1264 i18n: blame: mark parseopt strings for translation
1265 i18n: branch: mark parseopt strings for translation
1266 i18n: cat-file: mark parseopt strings for translation
1267 i18n: check-attr: mark parseopt strings for translation
1268 i18n: checkout-index: mark parseopt strings for translation
1269 i18n: checkout: mark parseopt strings for translation
1270 i18n: cherry: mark parseopt strings for translation
1271 i18n: clean: mark parseopt strings for translation
1272 i18n: clone: mark parseopt strings for translation
1273 i18n: column: mark parseopt strings for translation
1274 i18n: commit: mark parseopt strings for translation
1275 i18n: count-objects: mark parseopt strings for translation
1276 i18n: config: mark parseopt strings for translation
1277 i18n: describe: mark parseopt strings for translation
1278 i18n: fast-export: mark parseopt strings for translation
1279 i18n: fetch: mark parseopt strings for translation
1280 i18n: fmt-merge-msg: mark parseopt strings for translation
1281 i18n: for-each-ref: mark parseopt strings for translation
1282 i18n: format-patch: mark parseopt strings for translation
1283 i18n: fsck: mark parseopt strings for translation
1284 i18n: gc: mark parseopt strings for translation
1285 i18n: grep: mark parseopt strings for translation
1286 i18n: hash-object: mark parseopt strings for translation
1287 i18n: help: mark parseopt strings for translation
1288 i18n: init-db: mark parseopt strings for translation
1289 i18n: log: mark parseopt strings for translation
1290 i18n: ls-files: mark parseopt strings for translation
1291 i18n: ls-tree: mark parseopt strings for translation
1292 i18n: merge-base: mark parseopt strings for translation
1293 i18n: merge-file: mark parseopt strings for translation
1294 i18n: merge: mark parseopt strings for translation
1295 i18n: mktree: mark parseopt strings for translation
1296 i18n: mv: mark parseopt strings for translation
1297 i18n: name-rev: mark parseopt strings for translation
1298 i18n: notes: mark parseopt strings for translation
1299 i18n: pack-objects: mark parseopt strings for translation
1300 i18n: pack-refs: mark parseopt strings for translation
1301 i18n: prune-packed: mark parseopt strings for translation
1302 i18n: prune: mark parseopt strings for translation
1303 i18n: push: mark parseopt strings for translation
1304 i18n: read-tree: mark parseopt strings for translation
1305 i18n: remote: mark parseopt strings for translation
1306 i18n: replace: mark parseopt strings for translation
1307 i18n: status: mark parseopt strings for translation
1308 i18n: rerere: mark parseopt strings for translation
1309 i18n: reset: mark parseopt strings for translation
1310 i18n: rev-parse: mark parseopt strings for translation
1311 i18n: revert, cherry-pick: mark parseopt strings for translation
1312 i18n: rm: mark parseopt strings for translation
1313 i18n: shortlog: mark parseopt strings for translation
1314 am: quote string for translation before passing to eval_gettextln
1315 i18n: show-branch: mark parseopt strings for translation
1316 i18n: show-ref: mark parseopt strings for translation
1317 i18n: symbolic-ref: mark parseopt strings for translation
1318 i18n: tag: mark parseopt strings for translation
1319 i18n: update-index: mark parseopt strings for translation
1320 i18n: update-ref: mark parseopt strings for translation
1321 i18n: update-server-info: mark parseopt strings for translation
1322 i18n: verify-pack: mark parseopt strings for translation
1323 i18n: verify-tag: mark parseopt strings for translation
1324 i18n: write-tree: mark parseopt strings for translation
1325 Reduce translations by using same terminologies
1326 Use imperative form in help usage to describe an action
1327 branch -v: align even when branch names are in UTF-8
1328 checkout: pass "struct checkout_opts *" as const pointer
1329 checkout: move more parameters to struct checkout_opts
1330 i18n: mark more index-pack strings for translation
1331 status: remove i18n legos
1332 checkout: reorder option handling
1333 fetch: align per-ref summary report in UTF-8 locales
1336 git p4 test: move client_view() function to library
1337 git p4 test: add broken --use-client-spec --detect-branches tests
1338 git p4: set self.branchPrefixes in initialization
1339 git p4: do wildcard decoding in stripRepoPath
1340 git p4: make branch detection work with --use-client-spec
1341 git p4 test: remove bash-ism of combined export/assignment
1342 git p4: gracefully fail if some commits could not be applied
1343 git p4: remove submit failure options [a]pply and [w]rite
1344 git p4: move conflict prompt into run, add [q]uit input
1345 git p4: standardize submit cancel due to unchanged template
1346 git p4: test clean-up after failed submit, fix added files
1347 git p4: rearrange submit template construction
1348 git p4: revert deleted files after submit cancel
1349 git p4: accept -v for --verbose
1350 git p4: add submit --dry-run option
1351 git p4: add submit --prepare-p4-only option
1352 git-p4: add submit --conflict option and config varaiable
1355 l10n: Update Swedish translation (1166t0f0u)
1356 Update Swedish translation (1967t0f0u)
1357 l10n: Fixes to Swedish translation
1359 Philipp A. Hartmann (1):
1360 contrib: add credential helper for GnomeKeyring
1363 l10n: de.po: translate 2 new messages
1365 Ramsay Allan Jones (12):
1366 t3300-*.sh: Fix a TAP parse error
1367 t3902-*.sh: Skip all tests rather than each test
1368 t4016-*.sh: Skip all tests rather than each test
1369 test-lib.sh: Fix some shell coding style violations
1370 test-lib.sh: Add check for invalid use of 'skip_all' facility
1371 test-lib.sh: Suppress the "passed all ..." message if no tests run
1372 path.c: Remove the 'git_' prefix from a file scope function
1373 path.c: Don't discard the return value of vsnpath()
1374 path.c: Use vsnpath() in the implementation of git_path()
1375 Call git_pathdup() rather than xstrdup(git_path("..."))
1376 Call mkpathdup() rather than xstrdup(mkpath(...))
1377 test-string-list.c: Fix some sparse warnings
1380 archive-zip: support UTF-8 paths
1381 archive-zip: support UTF-8 paths
1382 archive-zip: write extended timestamp
1383 MALLOC_CHECK: enable it, unless disabled explicitly
1386 difftool: silence warning
1388 Sebastian Schuberth (1):
1389 Add Code Compare v2.80.4 as a merge / diff tool for Windows
1391 Stefano Lattarini (2):
1392 build: improve GIT_CONF_SUBST signature
1393 build: don't duplicate substitution of make variables
1396 gettext: do not translate empty string
1397 in_merge_bases(): omit unnecessary redundant common ancestor reduction
1400 l10n: vi.po & TEAMS: review Vietnamese translation
1401 l10n: vi.po: update to v1.7.12-146-g16d26
1404 Version v1.7.12.4; changes since v1.7.12.3:
1405 -------------------------------------------
1408 tests: "cp -a" is a GNUism
1411 Documentation/Makefile: Allow custom XMLTO binary
1413 Dylan Alex Simon (1):
1414 gitweb.cgi: fix "comitter_tz" typo in feed
1417 http: fix segfault in handle_curl_result
1420 merge: teach -Xours/-Xtheirs to binary ll-merge driver
1421 attr: "binary" attribute should choose built-in "binary" merge driver
1422 ll-merge: warn about inability to merge binary files only when we can't
1423 t1450: the order the objects are checked is undefined
1424 gitcli: parse-options lets you omit tail of long options
1427 Nguyễn Thái Ngọc Duy (2):
1428 gitignore.txt: suggestions how to get literal # or ! at the beginning
1429 attr: a note about the order of .gitattributes lookup
1432 Doc: shallow clone deepens _to_ new depth
1433 Doc: separate gitignore pattern sources
1434 Doc add: link gitignore
1435 Doc clean: add See Also link
1436 Doc branch: show -vv option and alternative
1438 Ramkumar Ramachandra (3):
1439 t/test-lib: make sure Git has already been built
1440 test-lib: use $SHELL_PATH, not $SHELL
1441 Git url doc: mark ftp/ftps as read-only and deprecate them
1444 Fix spelling error in post-receive-email hook
1447 l10n: de.po: fix a few minor typos
1450 Version v1.7.12.3; changes since v1.7.12.2:
1451 -------------------------------------------
1454 receive-pack: redirect unpack-objects stdout to /dev/null
1455 receive-pack: send pack-processing stderr over sideband
1456 receive-pack: drop "n/a" on unpacker errors
1459 git blame: document that it always follows origin across whole-file renames
1460 Start preparing for 1.7.12.3
1464 mailinfo: don't require "text" mime type for attachments
1467 commit: pay attention to submodule.$name.ignore in .gitmodules
1470 l10n: Fix to Swedish translation
1473 clone --single: limit the fetch refspec to fetched branch
1475 Ramkumar Ramachandra (1):
1476 submodule: if $command was not matched, don't parse other args
1478 Shawn O. Pearce (2):
1479 Revert "retry request without query when info/refs?query fails"
1480 Enable info/refs gzip decompression in HTTP client
1483 Version v1.7.12.2; changes since v1.7.12.1:
1484 -------------------------------------------
1487 fetch --all: pass --tags/--no-tags through to each remote
1490 run-command.c: fix broken list iteration in clear_child_for_cleanup
1492 Felipe Contreras (1):
1493 completion: fix shell expansion of items
1496 argv-array: add pop function
1497 argv-array: fix bogus cast when freeing array
1498 fetch: use argv_array instead of hand-building arrays
1499 Revert "completion: fix shell expansion of items"
1502 submodule: use argv_array instead of hand-building arrays
1505 Documentation: describe subject more precisely
1507 Jonathan "Duke" Leto (1):
1508 Improve the description of GIT_PS1_SHOWUPSTREAM
1510 Junio C Hamano (11):
1511 mailinfo: strip "RE: " prefix
1512 blame $path: avoid getting fooled by case insensitive filesystems
1513 blame: allow "blame file" in the middle of a conflicted merge
1514 grep: teach --debug option to dump the parse tree
1515 log --grep/--author: honor --all-match honored for multiple --grep patterns
1516 log: document use of multiple commit limiting options
1517 grep.c: mark private file-scope symbols as static
1518 mailinfo: do not concatenate charset= attribute values from mime headers
1519 grep.c: make two symbols really file-scope static this time
1520 Start preparation for 1.7.12.2
1523 Michael J Gruber (6):
1524 grep: show --debug output only once
1525 t7810-grep: bring log --grep tests in common form
1526 t7810-grep: test multiple --grep with and without --all-match
1527 t7810-grep: test multiple --author with --all-match
1528 t7810-grep: test interaction of multiple --grep and --author options
1529 t7810-grep: test --all-match with multiple --grep and --author options
1531 Nguyễn Thái Ngọc Duy (3):
1532 remote: prefer subcommand name 'remove' to 'rm'
1533 doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt
1534 Revert diffstat back to English
1537 l10n: de.po: correct translation of a 'rebase' message
1540 ls-remote: document the '--get-url' option
1543 Documentation: Document signature showing options
1546 l10n: Unify the translation for '(un)expected'
1547 l10n: Improve many translation for zh_CN
1550 Version v1.7.12.1; changes since v1.7.12:
1551 -----------------------------------------
1554 Fix '\ No newline...' annotation in rewrite diffs
1557 Add missing -z to git check-attr usage text for consistency with man page
1560 Documentation/git-filter-branch: Move note about effect of removing commits
1563 t/t5400: demonstrate breakage caused by informational message from prune
1564 prune.c: only print informational message in show_only or verbose mode
1567 gitk: Teach "Reread references" to reload tags
1568 gitk: Rename 'tagcontents' to 'cached_tagcontent'
1570 Eric S. Raymond (4):
1571 fast-import: document the --done option
1572 contrib/ciabot: Get ciabot configuration from git variables
1573 Improved documentation for the ciabot scripts.
1574 Make the ciabot scripts completely self-configuring in the normal case.
1576 Felipe Contreras (1):
1577 gitk: Avoid Meta1-F5
1580 Let submodule command exit with error status if path does not exist
1581 Documentation/CodingGuidelines: spell out more shell guidelines
1584 gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
1587 diff: do not use null sha1 as a sentinel value
1588 do not write null sha1s to on-disk index
1589 fsck: detect null sha1 in tree entries
1590 include agent identifier in capability string
1591 docs: monospace listings in docbook output
1592 check-docs: mention gitweb specially
1593 check-docs: update non-command documentation list
1594 command-list: add git-sh-i18n
1595 command-list: mention git-credential-* helpers
1596 check-docs: factor out command-list
1597 check-docs: list git-gui as a command
1598 check-docs: drop git-help special-case
1599 check-docs: get documented command list from Makefile
1600 send-pack: fix capability-sending logic
1601 do not send client agent unless server does first
1602 parse_feature_request: make it easier to see feature values
1603 fetch-pack: mention server version with verbose output
1604 config: warn on inaccessible files
1605 gitignore: report access errors of exclude files
1606 attr: warn on inaccessible attribute files
1607 t5550: put auth-required repo in auth/dumb
1608 t5550: factor out http auth setup
1609 t/lib-httpd: only route auth/dumb to dumb repos
1610 t/lib-httpd: recognize */smart/* repos as smart-http
1611 t: test basic smart-http authentication
1612 t: test http access to "half-auth" repositories
1613 http: factor out http error code handling
1614 http: prompt for credentials on failed POST
1615 log: fix --quiet synonym for -s
1617 Joachim Schmitz (2):
1618 http.c: don't use curl_easy_strerror prior to curl-7.12.0
1619 sha1_file.c: introduce get_max_fd_limit() helper
1621 Junio C Hamano (34):
1622 test: rename $satisfied to $satisfied_prereq
1623 test: allow prerequisite to be evaluated lazily
1624 config: "git config baa" should exit with status 1
1625 t7406: fix misleading "rev-parse --max-count=1 HEAD"
1626 sane_execvp(): ignore non-directory on $PATH
1627 Documentation: do not mention .git/refs/* directories
1628 receive-pack: do not leak output from auto-gc to standard output
1629 sh-setup: protect from exported IFS
1630 fetch-pack: do not ask for unadvertised capabilities
1631 send-email: validate & reconfirm interactive responses
1632 rev-list docs: clarify --topo-order description
1633 gitcli: describe abbreviation of long options
1634 Documentation: update the introductory section
1635 git-config doc: unconfuse an example
1636 precompose-utf8: do not call checks for non-ascii "utf8"
1637 warn_on_inaccessible(): a helper to warn on inaccessible paths
1638 specifying ranges: we did not mean to make ".." an empty set
1639 mergetool: style fixes
1640 Prepare for 1.7.11.6
1641 apply: compute patch->def_name correctly under -p0
1642 doc: "git checkout -b/-B/--orphan" always takes a branch name
1643 split_ident_line(): make best effort when parsing author/committer line
1644 Document file-glob for "git checkout -- '*.c'"
1645 gitcli: formatting fix
1646 gitcli: contrast wildcard given to shell and to git
1648 Start preparing for 1.7.12.1
1650 Further merging down for 1.7.12.1
1651 Further merging in preparation for 1.7.12.1
1652 attr: failure to open a .gitattributes file is OK with ENOTDIR
1654 Draft release notes to 1.7.12.1
1658 t6300: test sort with multiple keys
1659 for-each-ref: Fix sort with multiple keys
1661 Martin von Zweigbergk (4):
1662 add tests for 'git rebase --keep-empty'
1663 teach log --no-walk=unsorted, which avoids sorting
1664 demonstrate broken 'git cherry-pick three one two'
1665 cherry-pick/revert: respect order of revisions to pick
1668 setup: clarify error messages for file/revisions ambiguity
1670 Michael Haggerty (1):
1671 git-config.txt: fix example
1673 Michael J Gruber (6):
1674 test-lib: provide case insensitivity as a prerequisite
1675 t0050: use the CASE_INSENSITIVE_FS test prereq
1676 t0050: use the SYMLINKS test prereq
1677 test-lib: provide UTF8 behaviour as a prerequisite
1678 rebase -i: use full onto sha1 in reflog
1679 t3910: use the UTF8_NFD_TO_NFC test prereq
1681 Michał Kiedrowicz (1):
1682 tests: Introduce test_seq
1685 man: git pull -r is a short for --rebase
1687 Mischa POSLAWSKY (1):
1688 git-jump: ignore (custom) prefix in diff mode
1690 Nguyễn Thái Ngọc Duy (1):
1691 read_index_from: remove bogus errno assignments
1694 apply: delete unused deflate_origlen from patch struct
1697 test: git-stash conflict sets up rerere
1698 stash: invoke rerere in case of conflict
1701 Doc: Improve shallow depth wording
1703 Ramkumar Ramachandra (1):
1704 t/perf: add "trash directory" to .gitignore
1706 Ramsay Allan Jones (1):
1707 test-regex: Add a test to check for a bug in the regex routines
1709 Robin Rosenberg (1):
1710 cleanup precompose_utf8
1713 Make 'git submodule update --force' always check out submodules.
1716 send-email: initial_to and initial_reply_to are both optional
1719 send-email: improve RFC2047 quote parsing
1720 diff_setup_done(): return void
1721 merge-recursive: eliminate flush_buffer() in favor of write_in_full()
1723 Wesley J. Landaker (1):
1724 Documentation: indent-with-non-tab uses "equivalent tabs" not 8
1727 completion: add --no-edit to git-commit
1730 Version v1.7.12; changes since v1.7.12-rc3:
1731 -------------------------------------------
1734 Documentation: update URL for formatted pages
1738 l10n: Fixes to Swedish translation
1741 Version v1.7.12-rc3; changes since v1.7.12-rc2:
1742 -----------------------------------------------
1745 Enable HAVE_DEV_TTY for Solaris
1748 terminal: seek when switching between reading and writing
1751 l10n: Update one message in git.pot
1752 l10n: zh_CN.po: update one translation
1759 Documentation: list git-credential in plumbing commands
1762 git svn: reset invalidates the memoized mergeinfo caches
1765 l10n: Update Swedish translation (1168t0f0u)
1768 l10n: de.po: translate 77 new messages
1771 git svn: handle errors and concurrent commits in dcommit
1774 l10n: vi.po: update one message
1777 Version v1.7.12-rc2; changes since v1.7.12-rc1:
1778 -----------------------------------------------
1781 i18n: New keywords for xgettext extraction from sh
1782 i18n: rebase: mark messages for translation
1783 i18n: Rewrite gettext messages start with dash
1784 rebase: remove obsolete and unused LONG_USAGE which breaks xgettext
1785 i18n: am: mark more strings for translation
1786 Remove dead code which contains bad gettext block
1787 i18n: merge-recursive: mark strings for translation
1788 l10n: Update git.pot (4 new, 3 removed messages)
1789 l10n: zh_CN.po: translate 4 new messages
1790 l10n: Update git.pot (76 new, 4 removed messages)
1791 l10n: zh_CN.po: translate 76 new messages
1794 Makefile: use overridable $(FIND) instead of hard-coded 'find'
1797 Prepare for 1.7.11.5
1798 Drop 1.7.11.x items from 1.7.12 release notes
1802 git-remote-mediawiki: replace TODO-list in comment by appropriate link
1804 Nguyễn Thái Ngọc Duy (1):
1805 i18n: leave \n out of translated diffstat
1808 l10n: de.po: translate 4 new messages
1809 git-rebase.sh: fix typo in an error message
1810 merge-recursive: separate message for common ancestors
1813 l10n: vi.po: translate 4 new messages
1814 l10n: vi.po update to follow POT in 3b613
1817 doc: A few minor copy edits.
1820 Version v1.7.12-rc1; changes since v1.7.12-rc0:
1821 -----------------------------------------------
1824 rebase -i: handle fixup of root commit correctly
1827 git-submodule: work with GIT_DIR/GIT_WORK_TREE
1828 t7409: make sure submodule is initialized and updated in more detail
1830 Florian Achleitner (1):
1831 Add explanatory comment for transport-helpers refs mapping.
1834 link_alt_odb_entry: fix read over array bounds reported by valgrind
1837 advice: pass varargs to strbuf_vaddf, not strbuf_addf
1838 commit: check committer identity more strictly
1839 commit: document the temporary commit message file
1840 test-lib.sh: unset XDG_CONFIG_HOME
1841 attr: make sure we have an xdg path before using it
1842 t1306: check that XDG_CONFIG_HOME works
1843 t/lib-httpd: handle running under --valgrind
1844 help.c::uniq: plug a leak
1845 checkout: don't confuse ref and object flags
1846 t7502: clean up fake_editor tests
1847 t7502: properly quote GIT_EDITOR
1848 t7502: narrow checks for author/committer name in template
1849 t7502: drop confusing test_might_fail call
1850 t7502: handle systems where auto-identity is broken
1851 t7502: test early quit from commit with bad ident
1852 t: add missing executable bit to t7409
1855 test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
1856 mergetool: support --tool-help option like difftool does
1857 Update draft release notes to 1.7.12
1858 Enumerate revision range specifiers in the documentation
1859 help.c::exclude_cmds(): plug a leak
1860 perl: detect new files in MakeMaker builds
1861 Update draft release notes to 1.7.12
1866 ignore: make sure we have an xdg path before using it
1869 Make <refname> documentation more consistent.
1871 Michael G. Schwern (14):
1872 Quiet warning if Makefile.PL is run with -w and no --localedir
1873 Don't lose Error.pm if $@ gets clobbered.
1874 The Makefile.PL will now find .pm files itself.
1875 Extract some utilities from git-svn to allow extracting Git::SVN.
1876 Prepare Git::SVN for extraction into its own file.
1877 Extract Git::SVN from git-svn into its own .pm file.
1878 Move initialization of Git::SVN variables into Git::SVN.
1879 Prepare Git::SVN::Log for extraction from git-svn.
1880 Extract Git::SVN::Log from git-svn.
1881 Prepare Git::SVN::Migration for extraction from git-svn.
1882 Extract Git::SVN::Migration from git-svn.
1883 Load all the modules in one place and before running code.
1884 Move Git::IndexInfo into its own file.
1885 Extract Git::SVN::GlobSpec from git-svn.
1887 Ramsay Allan Jones (2):
1888 t1100-*.sh: Fix an intermittent test failure
1889 t7810-*.sh: Remove redundant test
1892 Version v1.7.12-rc0; changes since v1.7.11.7:
1893 ---------------------------------------------
1895 Alexander Strasser (7):
1896 t4012: modernize style for quoting
1897 t4012: Unquote git command fragment in test title
1898 t4012: Actually quote the sed script
1899 t4012: Break up pipe into serial redirections
1900 t4012: Make --shortstat test more robust
1901 t4012: Re-indent test snippets
1902 t4012: Use test_must_fail instead of if-else
1905 Fix formatting in git-config(1)
1908 rebase -i: support --root without --onto
1909 Add tests for rebase -i --root without --onto
1910 Add config variable to set HTML path for git-help --web
1911 Allow help.htmlpath to be a URL prefix
1914 vcs-svn: drop no-op reset methods
1915 vcs-svn: avoid self-assignment in dummy initialization of pre_off
1916 vcs-svn: simplify cleanup in apply_one_window
1917 vcs-svn: use constcmp instead of prefixcmp
1918 vcs-svn: use strstr instead of memmem
1919 vcs-svn: suppress signed/unsigned comparison warnings
1920 vcs-svn: suppress a signed/unsigned comparison warning
1922 Felipe Contreras (2):
1923 completion: remove executable mode
1924 completion: split __git_ps1 into a separate script
1927 git p4: refactor diffOpts calculation
1928 git p4: add support for 'p4 move' in P4Submit
1930 Guillaume Sasdy (4):
1931 git-remote-mediawiki: scripts to install, delete and clear a MediaWiki
1932 git-remote-mediawiki: test environment of git-remote-mediawiki
1933 git-remote-mediawiki (t9360): test git-remote-mediawiki clone
1934 git-remote-mediawiki (t9361): test git-remote-mediawiki pull and push
1937 remove the impression of unexpectedness when access is denied
1939 Huynh Khoi Nguyen Nguyen (4):
1940 config: read (but not write) from $XDG_CONFIG_HOME/git/config file
1941 Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore
1942 Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes
1943 config: write to $XDG_CONFIG_HOME/git/config file when appropriate
1945 Javier Roucher Iglesias (1):
1946 add 'git credential' plumbing command
1949 docs: drop asciidoc7compatible flag
1950 docs: drop antique comment from Makefile
1951 docs/clone: mention that --local may be ignored
1952 clone: allow --no-local to turn off local optimizations
1953 move git_version_string into version.c
1954 version: add git_user_agent function
1955 http: get default user-agent from git_user_agent
1956 t1304: improve setfacl prerequisite setup
1957 Makefile: sort LIB_H list
1958 Makefile: fold MISC_H into LIB_H
1959 Makefile: do not have git.o depend on common-cmds.h
1960 Makefile: apply dependencies consistently to sparse/asm targets
1961 Makefile: do not replace @@GIT_USER_AGENT@@ in scripts
1962 Makefile: split GIT_USER_AGENT from GIT-CFLAGS
1963 Makefile: split prefix flags from GIT-CFLAGS
1964 Makefile: do not replace @@GIT_VERSION@@ in shell scripts
1965 Makefile: update scripts when build-time parameters change
1966 Makefile: build instaweb similar to other scripts
1967 Makefile: move GIT-VERSION-FILE dependencies closer to use
1968 index-pack: loop while inflating objects in unpack_data
1969 revision: avoid work after --max-count is reached
1970 status: color in-progress message like other header messages
1971 docs/credential: minor clarity fixups
1972 mw-to-git: check blank credential attributes via length
1973 credential: convert "url" attribute into its parsed subparts
1974 mw-to-git: use git-credential's URL parser
1977 l10n: Update git.pot (29 new messages)
1978 l10n: zh_CN.po: translate 29 new messages
1981 t7400: avoid path mangling issues
1982 perl/Makefile: Fix a missing double-quote
1983 t4012: use 'printf' instead of 'dd' to generate a binary file
1986 submodule: additional regression tests for relative URLs
1987 submodule: document failure to handle relative superproject origin URLs
1988 submodule: fix sync handling of some relative superproject origin URLs
1989 submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar
1991 Jonathan Nieder (8):
1992 vcs-svn: allow import of > 4GiB files
1993 vcs-svn: suppress -Wtype-limits warning
1994 perl/Makefile: move "mkdir -p" to module installation loop for maintainability
1995 vcs-svn: suppress a signed/unsigned comparison warning
1996 vcs-svn: allow 64-bit Prop-Content-Length
1997 Makefile: fold XDIFF_H and VCSSVN_H into LIB_H
1998 Makefile: be silent when only GIT_USER_AGENT changes
1999 Makefile: document ground rules for target-specific dependencies
2001 Junio C Hamano (58):
2002 completion: warn people about duplicated function
2003 sha1_name.c: indentation fix
2004 Kick off post 1.7.11 cycle
2005 The first batch for 1.7.12
2006 Second batch for 1.7.12
2007 Third batch for 1.7.12
2008 sha1_name.c: hide get_sha1_with_context_1() ugliness
2009 sha1_name.c: get rid of get_sha1_with_mode_1()
2010 sha1_name.c: get rid of get_sha1_with_mode()
2011 sha1_name.c: clarify what "fake" is for in find_short_object_filename()
2012 sha1_name.c: rename "now" to "current"
2013 sha1_name.c: refactor find_short_packed_object()
2014 sha1_name.c: correct misnamed "canonical" and "res"
2015 sha1_name.c: restructure disambiguation of short names
2016 get_sha1(): fix error status regression
2017 sha1_name.c: allow get_short_sha1() to take other flags
2018 sha1_name.c: teach get_short_sha1() a commit-only option
2019 Fourth batch for 1.7.12
2020 Fifth batch for 1.7.12
2021 apply: fix an incomplete comment in check_patch()
2022 apply: a bit more comments on PATH_TO_BE_DELETED
2023 apply: clear_image() clears things a bit more
2024 apply: refactor read_file_or_gitlink()
2025 apply: factor out checkout_target() helper function
2026 apply: split load_preimage() helper function out
2027 apply: refactor "previous patch" logic
2028 apply: further split load_preimage()
2029 apply: move check_to_create_blob() closer to its sole caller
2030 apply: move "already exists" logic to check_to_create()
2031 apply: accept -3/--3way command line option
2032 apply: fall back on three-way merge
2033 apply: plug the three-way merge logic in
2034 apply: move verify_index_match() higher
2035 apply: --3way with add/add conflict
2036 apply: register conflicted stages to the index
2037 apply: allow rerere() to work on --3way results
2038 apply: document --3way option
2039 sha1_name.c: get_describe_name() by definition groks only commits
2040 sha1_name.c: get_sha1_1() takes lookup flags
2041 sha1_name.c: many short names can only be committish
2042 sha1_name.c: teach lookup context to get_sha1_with_context()
2043 sha1_name.c: introduce get_sha1_committish()
2044 revision.c: allow handle_revision_arg() to take other flags
2045 revision.c: the "log" family, except for "show", takes committish
2046 sha1_name.c: add support for disambiguating other types
2047 apply: --build-fake-ancestor expects blobs
2048 commit-tree: the command wants a tree and commits
2049 reset: the command takes committish
2050 rev-parse: A and B in "rev-parse A..B" refer to committish
2051 rev-parse --disambiguate=<prefix>
2052 apply: tests for the --3way option
2053 Reduce draft release notes to 1.7.12
2054 t1512: ignore whitespaces in wc -l output
2055 t1512: match the "other" object names
2056 Sixth batch for 1.7.12
2057 Update draft release notes for 7th batch
2058 Update draft release notes to 1.7.12
2062 rebase -i: teach "--exec <cmd>"
2063 wt-status.*: better advices for git status added
2064 t7512-status-help.sh: better advices for git status
2065 status: don't suggest "git rm" or "git add" if not appropriate
2066 status: better advices when splitting a commit (during rebase -i)
2069 git-svn: don't create master if another head exists
2071 Martin von Zweigbergk (4):
2072 rebase: don't source git-sh-setup twice
2073 rebase --root: print usage on too many args
2074 am --rebasing: get patch body from commit, not from mailbox
2075 am: don't call mailinfo if $rebasing
2078 git credential fill: output the whole 'struct credential'
2079 git-remote-mediawiki: add credential support
2080 git-remote-mediawiki: don't compute the diff when getting commit message
2081 git-remote-mediawiki: don't "use encoding 'utf8';"
2082 git-remote-mediawiki: split get_mw_pages into smaller functions
2083 git-remote-mediawiki: improve support for non-English Wikis
2084 git-remote-mediawiki: support for uploading file in test environment
2085 git-remote-mediawiki: change return type of get_mw_pages
2086 git-remote-mediawiki: refactor loop over revision ids
2087 git-remote-mediawiki: extract revision-importing loop to a function
2088 git-remote-mediawiki: more efficient 'pull' in the best case
2089 git-remote-mediawiki: be more defensive when requests fail
2090 git-remote-mediawiki: update comments to reflect credential support
2091 config: fix several access(NULL) calls
2092 git-remote-mediawiki: don't split namespaces with spaces
2093 git-remote-mediawiki: actually send empty comment when they're empty
2094 git-remote-mediawiki: make mediafiles export optional
2095 git-remote-mediawiki: get rid of O(N^2) loop
2096 git-remote-mediawiki: use --force when adding notes
2097 git-remote-mediawiki: show progress information when listing pages
2098 git-remote-mediawiki: show progress information when getting last remote revision
2099 git-remote-mediawiki: properly deal with invalid remote revisions
2100 git-remote-mediawiki: fix incorrect test usage in test
2101 git-remote-mediawiki: allow page names with a ':'
2103 Michael J Gruber (1):
2104 t3404: make test 57 work with dash and others
2106 NGUYEN Kim Thuat (2):
2107 git-remote-mediawiki: send "File:" attachments to a remote wiki
2108 git-remote-mediawiki (t9363): test 'File:' import and export
2111 gitweb: Cleanup git_print_log()
2112 gitweb: Handle other types of tag in git_print_log
2113 gitweb: Add support to Link: tag
2115 Nguyễn Thái Ngọc Duy (12):
2116 index-pack: hash non-delta objects while reading from stream
2117 index-pack: use streaming interface on large blobs (most of the time)
2118 index-pack: factor out unpack core from get_data_from_pack
2119 index-pack: use streaming interface for collision test on large blobs
2120 pack-objects: use streaming interface for reading large loose blobs
2121 Unindent excluded_from_list()
2122 dir.c: get rid of the wildcard symbol set in no_wildcard()
2123 exclude: do strcmp as much as possible before fnmatch
2124 Remove i18n legos in notifying new branch tracking setup
2125 reflog: remove i18n legos in pruning message
2126 notes-merge: remove i18n legos in merge result message
2127 rerere: remove i18n legos in result message
2130 Restore use of 'help.format' configuration property in 'git help'
2133 git-remote-mediawiki: import "File:" attachments
2136 git p4 test: wait longer for p4d to start and test its pid
2137 git p4 test: use real_path to resolve p4 client symlinks
2138 git p4 test: simplify quoting involving TRASH_DIRECTORY
2139 git p4 test: never create default test repo
2140 git p4 test: rename some "git-p4 command" strings
2141 git p4 test: check for error message in failed test
2142 git p4 test: copy source indeterminate
2143 git p4 test: cleanup_git should make a new $git
2144 git p4 test: split up big t9800 test
2145 git p4 test: fix badp4dir test
2146 git p4: remove unused P4Submit interactive setting
2147 git p4 test: refactor marshal_dump
2148 git p4: notice Jobs lines in git commit messages
2151 Update Swedish translation (1095t0f0u)
2154 l10n: de.po: translate 29 new messages
2156 Ramsay Allan Jones (1):
2157 vcs-svn: rename check_overflow and its arguments for clarity
2160 tests: move code to run tests under bash into a helper library
2161 tests: add tests for the bash prompt functions in the completion script
2162 completion: respect $GIT_DIR
2164 Simon Cathebras (1):
2165 git-remote-mediawiki (t9362): test git-remote-mediawiki with UTF8 characters
2167 Stefano Lattarini (7):
2168 autoconf: GIT_CONF_APPEND_LINE: change signature
2169 autoconf: GIT_CONF_APPEND_LINE -> GIT_CONF_SUBST
2170 autoconf: remove some redundant shell indirections
2171 autoconf: remove few redundant semicolons
2172 autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append'
2173 build: "make clean" should not remove configure-generated files
2174 build: reconfigure automatically if configure.ac changes
2176 Thomas Gummerer (2):
2177 Replace strlen() with ce_namelen()
2178 Strip namelen out of ce_flags into a ce_namelen field
2181 difftool: only copy back files modified during directory diff
2183 Torsten Bögershausen (1):
2184 git on Mac OS and precomposed unicode
2187 l10n: Update translation for Vietnamese
2189 Vincent van Ravesteijn (1):
2190 help: use HTML as the default help format on Windows
2193 doc: A few minor copy edits.
2196 Version v1.7.11.7; changes since v1.7.11.6:
2197 -------------------------------------------
2200 gitk: Teach "Reread references" to reload tags
2201 gitk: Rename 'tagcontents' to 'cached_tagcontent'
2203 Felipe Contreras (1):
2204 gitk: Avoid Meta1-F5
2207 t5550: put auth-required repo in auth/dumb
2208 t5550: factor out http auth setup
2209 t/lib-httpd: only route auth/dumb to dumb repos
2210 t/lib-httpd: recognize */smart/* repos as smart-http
2211 t: test basic smart-http authentication
2212 t: test http access to "half-auth" repositories
2213 http: factor out http error code handling
2214 http: prompt for credentials on failed POST
2215 log: fix --quiet synonym for -s
2218 specifying ranges: we did not mean to make ".." an empty set
2219 apply: compute patch->def_name correctly under -p0
2220 doc: "git checkout -b/-B/--orphan" always takes a branch name
2221 split_ident_line(): make best effort when parsing author/committer line
2222 Document file-glob for "git checkout -- '*.c'"
2223 gitcli: formatting fix
2224 gitcli: contrast wildcard given to shell and to git
2228 t6300: test sort with multiple keys
2229 for-each-ref: Fix sort with multiple keys
2231 Ramsay Allan Jones (1):
2232 test-regex: Add a test to check for a bug in the regex routines
2235 Version v1.7.11.6; changes since v1.7.11.5:
2236 -------------------------------------------
2239 Fix '\ No newline...' annotation in rewrite diffs
2242 Enable HAVE_DEV_TTY for Solaris
2245 t/t5400: demonstrate breakage caused by informational message from prune
2247 Eric S. Raymond (3):
2248 contrib/ciabot: Get ciabot configuration from git variables
2249 Improved documentation for the ciabot scripts.
2250 Make the ciabot scripts completely self-configuring in the normal case.
2253 Let submodule command exit with error status if path does not exist
2254 Documentation/CodingGuidelines: spell out more shell guidelines
2257 gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
2260 commit: check committer identity more strictly
2261 diff: do not use null sha1 as a sentinel value
2262 do not write null sha1s to on-disk index
2263 fsck: detect null sha1 in tree entries
2264 terminal: seek when switching between reading and writing
2265 docs: monospace listings in docbook output
2267 Junio C Hamano (13):
2268 config: "git config baa" should exit with status 1
2269 t7406: fix misleading "rev-parse --max-count=1 HEAD"
2270 sane_execvp(): ignore non-directory on $PATH
2271 Documentation: do not mention .git/refs/* directories
2272 receive-pack: do not leak output from auto-gc to standard output
2273 sh-setup: protect from exported IFS
2274 rev-list docs: clarify --topo-order description
2275 gitcli: describe abbreviation of long options
2276 git-config doc: unconfuse an example
2277 mergetool: style fixes
2278 Prepare for 1.7.11.6
2283 builtin.h: remove unused cmd_<foo> declarations
2285 Martin von Zweigbergk (1):
2286 add tests for 'git rebase --keep-empty'
2289 setup: clarify error messages for file/revisions ambiguity
2291 Michael Haggerty (1):
2292 git-config.txt: fix example
2294 Michael J Gruber (1):
2295 rebase -i: use full onto sha1 in reflog
2297 Michał Kiedrowicz (1):
2298 tests: Introduce test_seq
2301 man: git pull -r is a short for --rebase
2303 Nguyễn Thái Ngọc Duy (1):
2304 read_index_from: remove bogus errno assignments
2307 apply: delete unused deflate_origlen from patch struct
2310 test: git-stash conflict sets up rerere
2311 stash: invoke rerere in case of conflict
2314 Make 'git submodule update --force' always check out submodules.
2317 send-email: improve RFC2047 quote parsing
2318 diff_setup_done(): return void
2319 merge-recursive: eliminate flush_buffer() in favor of write_in_full()
2322 Version v1.7.11.5; changes since v1.7.11.4:
2323 -------------------------------------------
2326 link_alt_odb_entry: fix read over array bounds reported by valgrind
2329 checkout: don't confuse ref and object flags
2331 Jonathan Nieder (4):
2332 block-sha1: avoid pointer conversion that violates alignment constraints
2333 block-sha1: put expanded macro parameters in parentheses
2334 Makefile: fix location of listing produced by "make subdir/foo.s"
2335 Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads
2338 mergetool: support --tool-help option like difftool does
2339 Enumerate revision range specifiers in the documentation
2340 Prepare for 1.7.11.5
2343 Lawrence Mitchell (2):
2344 git-blame.el: Use with-current-buffer where appropriate
2345 git-blame.el: Do not use bare 0 to mean (point-min)
2348 Make <refname> documentation more consistent.
2350 Michael Schubert (1):
2351 Documentation/git-daemon: add missing word
2353 Ramkumar Ramachandra (1):
2354 commit: document a couple of options
2356 Ramsay Allan Jones (1):
2357 t7810-*.sh: Remove redundant test
2360 git: Wrong parsing of ssh urls with IPv6 literals ignores port
2362 Rüdiger Sonderfeld (2):
2363 git-blame.el: use mapc instead of mapcar
2364 git-blame.el: Do not use goto-line in lisp code
2367 doc: A few minor copy edits.
2370 Version v1.7.11.4; changes since v1.7.11.3:
2371 -------------------------------------------
2374 diff: test precedence of external diff drivers
2375 advice: pass varargs to strbuf_vaddf, not strbuf_addf
2376 commit: document the temporary commit message file
2379 submodules: don't stumble over symbolic links when cloning recursively
2382 filter-branch: do not forget the '@' prefix to force git-timestamp
2383 date.c: Fix off by one error in object-header date parsing
2384 t7003: add test to filter a branch with a commit at epoch
2385 commit-tree: resurrect command line parsing updates
2386 Revert "git-commit-tree(1): update synopsis"
2387 diff: correctly disable external_diff with --no-ext-diff
2391 am: indicate where a failed patch is to be found
2394 Version v1.7.11.3; changes since v1.7.11.2:
2395 -------------------------------------------
2398 Restore umasks influence on the permissions of work tree created by clone
2401 git-checkout: disallow --detach on unborn branch
2402 Allow edit of empty message with commit --amend
2405 fast-export: quote paths with spaces
2408 push: don't guess at qualifying remote refs on deletion
2409 add: create ADD_EDIT.patch with mode 0666
2410 commit: fix "--amend --only" with no pathspec
2412 Junio C Hamano (10):
2413 show: fix "range implies walking"
2414 t/test-lib.sh: export PERL_PATH for use in scripts
2415 tests: enclose $PERL_PATH in double quotes
2416 t/README: add a bit more Don'ts
2417 diff-index.c: do not pretend paths are pathspecs
2418 diff-index.c: unify handling of command line paths
2419 diff-index.c: "git diff" has no need to read blob from the standard input
2420 rerere: make rr-cache fanout directory honor umask
2421 cache_name_compare(): do not truncate while comparing paths
2424 Martin von Zweigbergk (1):
2425 add test case for rebase of empty commit
2428 Demonstrate git-show is broken with ranges
2430 Vincent van Ravesteijn (1):
2431 t: Replace 'perl' by $PERL_PATH
2434 Version v1.7.11.2; changes since v1.7.11.1:
2435 -------------------------------------------
2437 Carlos Martín Nieto (2):
2438 Documentation: --no-walk is no-op if range is specified
2439 git-cherry-pick.txt: clarify the use of revision range notation
2442 update-index: allow overwriting existing submodule index entries
2445 fix pager.diff with diff --no-index
2446 do not run pager with diff --no-index --quiet
2447 diff: handle relative paths in no-index
2449 Junio C Hamano (15):
2450 request-pull: really favor a matching tag
2451 ls-files -i: pay attention to exclusion of leading paths
2452 ls-files -i: micro-optimize path_excluded()
2453 tweak "bundle verify" of a complete history
2454 path_excluded(): update API to less cache-entry centric
2455 builtin/add.c: use path_excluded()
2456 unpack-trees.c: use path_excluded() in check_ok_to_remove()
2457 dir.c: make excluded() file scope static
2458 revision: "simplify" options imply topo-order sort
2459 revision: note the lack of free() in simplify_merges()
2460 archive: ustar header checksum is computed unsigned
2461 revision: ignore side parents while running simplify-merges
2462 index-pack: Disable threading on cygwin
2463 blame: compute abbreviation width that ensures uniqueness
2467 Documentation: Fix misspellings
2470 sha1_name: do not trigger detailed diagnosis for file arguments
2471 verify_filename(): ask the caller to chose the kind of diagnosis
2474 git-submodule.sh: fix filename in comment.
2476 Nguyễn Thái Ngọc Duy (1):
2477 clone: fix ref selection in --single-branch --branch=xxx
2480 Update Swedish translation (1066t0f0u)
2483 git-add--interactive.perl: Remove two unused variables
2486 diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes
2489 Version v1.7.11.1; changes since v1.7.11:
2490 -----------------------------------------
2493 docs: always define git-relative-html-prefix attribute
2496 git-commit-tree(1): update synopsis
2500 Documentation: spelling fixes
2503 Version v1.7.11; changes since v1.7.11-rc3:
2504 -------------------------------------------
2506 Alexander Strasser (1):
2507 diff: Only count lines in show_shortstats
2509 Jonathan Nieder (2):
2510 perl/Makefile.PL: warn about duplicate module list in perl/Makefile
2511 perl/Makefile: install Git::SVN::* when NO_PERL_MAKEMAKER=yes, too
2518 l10n: it.po: translate 212 new messages
2520 Ramsay Allan Jones (1):
2521 gitweb: Skip 'modification times' tests when no date parser available
2524 completion: put main git and gitk completion functions back into git namespace
2525 completion: remove credential helpers from porcelain commands
2527 Vincent van Ravesteijn (1):
2528 Do not autosquash in case of an implied interactive rebase
2531 Version v1.7.11-rc3; changes since v1.7.11-rc2:
2532 -----------------------------------------------
2535 docs: fix cross-directory linkgit references
2538 l10n: Update git.pot (27 new, 1 removed messages)
2539 l10n: zh_CN.po: translate 27 new messages
2541 Johannes Schindelin (1):
2542 fast-export: report SHA-1 instead of gibberish when marks exist already
2544 Jonathan Nieder (3):
2545 git-svn: make Git::SVN::Editor a separate file
2546 git-svn: make Git::SVN::RA a separate file
2547 git-svn: use YAML format for mergeinfo cache when possible
2550 fmt-merge-msg: make attribution into comment lines
2554 api-credential.txt: document that helpers field is filled-in automatically
2557 l10n: de.po: translate 27 new messages
2560 l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbb
2563 Version v1.7.11-rc2; changes since v1.7.11-rc1:
2564 -----------------------------------------------
2567 Add persistent-https to contrib
2570 l10n: Update git.pot (5 new, 3 removed messages)
2571 l10n: zh_CN.po: translate 2 new, 3 fuzzy messages
2574 git-svn: platform auth providers are working only on 1.6.15 or newer
2575 doc: fix xref link from api docs to manual pages
2579 api-credentials.txt: show the big picture first
2580 api-credentials.txt: mention credential.helper explicitly
2581 api-credentials.txt: add "see also" section
2584 l10n: de.po: translate 265 new messages
2585 l10n: de.po: translate 41 new messages
2586 l10n: de.po: translate 2 new, 3 fuzzy messages
2587 l10n: de.po: add additional newline
2589 Ramkumar Ramachandra (1):
2590 t3510 (cherry-pick-sequence): add missing '&&'
2593 l10n: Update translation for Vietnamese
2596 Version v1.7.11-rc1; changes since v1.7.11-rc0:
2597 -----------------------------------------------
2600 rebase: report invalid commit correctly
2601 Makefile: add missing GIT-VERSION-FILE dependency
2604 ident: split setup_ident into separate functions
2605 http-push: do not access git_default_email directly
2606 fmt-merge-msg: don't use static buffer in record_person
2607 move identity config parsing to ident.c
2608 move git_default_* variables to ident.c
2609 ident: trim trailing newline from /etc/mailname
2610 format-patch: use default email for generating message ids
2611 fmt_ident: drop IDENT_WARN_ON_NO_NAME code
2612 ident: don't write fallback username into git_default_name
2613 drop length limitations on gecos-derived names and emails
2614 ident: report passwd errors with a more friendly message
2615 ident: use full dns names to generate email addresses
2616 ident: use a dynamic strbuf in fmt_ident
2617 ident: trim whitespace from default name/email
2618 format-patch: refactor get_patch_filename
2619 fetch-pack: sort incoming heads
2620 fetch-pack: avoid quadratic behavior in remove_duplicates
2621 add sorting infrastructure for list refs
2622 fetch-pack: sort the list of incoming refs
2623 fetch-pack: avoid quadratic loop in filter_refs
2624 fetch-pack: sort incoming heads list earlier
2625 ident: reword empty ident error message
2626 ident: refactor NO_DATE flag in fmt_ident
2627 ident: let callers omit name with fmt_indent
2628 format-patch: use GIT_COMMITTER_EMAIL in message ids
2629 ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT
2630 ident: reject bogus email addresses with IDENT_STRICT
2631 format-patch: do not use bogus email addresses in message ids
2632 t5701: modernize style
2633 INSTALL: update asciidoc recommendation
2636 submodules: print "registered for path" message only once
2639 l10n: Update git.pot (41 new messages)
2640 l10n: zh.CN.po: update by msgmerge git.pot
2641 l10n: zh_CN.po: translate 323 new messages
2642 l10n: Set nplurals of zh_CN.po from 1 to 2
2643 i18n: apply: split to fix a partial i18n message
2645 Jonathan Nieder (3):
2646 git-svn: move Git::SVN::Prompt into its own file
2647 git-svn: rename SVN::Git::* packages to Git::SVN::*
2648 git-svn: make Git::SVN::Fetcher a separate file
2651 refs: do not create ref_entry when searching
2652 cherry-pick: regression fix for empty commits
2653 Start preparing for 1.7.10.4
2654 Update draft release notes to 1.7.11
2659 l10n: New it.po file with 504 translations
2662 Reduce cost of deletion in levenstein distance (4 -> 3)
2664 Michael Haggerty (5):
2665 free_ref_entry(): do not trigger reading of loose refs
2666 cmd_fetch_pack(): declare dest to be const
2667 cmd_fetch_pack(): handle non-option arguments outside of the loop
2668 cmd_fetch_pack(): combine the loop termination conditions
2669 cmd_fetch_pack(): respect constness of argv parameter
2671 Nguyễn Thái Ngọc Duy (2):
2672 pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .."
2673 pack-objects: refactor write_object() into helper functions
2676 Update Swedish translation (728t0f0u)
2679 refs: convert parameter of search_ref_dir() to length-limited string
2680 refs: convert parameter of create_dir_entry() to length-limited string
2681 refs: use strings directly in find_containing_dir()
2684 Init translation for Vietnamese
2685 First release translation for Vietnamese
2687 Vincent van Ravesteijn (1):
2688 Do not autosquash in case of an implied interactive rebase
2691 git-p4: Test changelists touching two branches
2692 git-p4: Verify detection of "empty" branch creation
2693 git-p4: Clean up branch test cases
2696 Version v1.7.11-rc0; changes since v1.7.10.5:
2697 ---------------------------------------------
2700 fixed order of assertion in tests
2701 sort assertion to make it more generic
2704 Fix refspecs in given example for git subtree pull.
2706 Avery Pennarun (72):
2707 basic options parsing and whatnot.
2708 'git subtree split' now basically works.
2709 We now copy the other stuff about a commit (changelog, author, etc).
2710 Print out the newly created commitid at the end, for use in other scripts.
2711 Add a new --rejoin option.
2712 Use information about prior splits to make sure merges work right.
2713 Added a --onto option, but it's so complicated I can't tell if it works.
2714 Hmm... can't actually filter rev-list on the subdir name.
2715 Skip over empty commits.
2716 Quick test script for generating reasonably complex merge scenarios.
2717 Prune out some extra merge commits by comparing their parents correctly.
2718 Even more aggressive commit trimming.
2719 Okay, that was a little too aggressive.
2720 Pass the path using the --prefix option instead of on the command line.
2721 Add a new 'git subtree add' command for adding subtrees from a given rev.
2722 Add 'git subtree merge' and 'git subtree pull'.
2723 Handle it successfully if a given parent commit has no parents.
2724 Change test.sh to test the new add, merge, and pull commands.
2726 Add --annotate option, and create recognizable file content during tests.
2727 Typo when searching for existing splits.
2728 Clarify why we can't do 'git rev-list' with a path.
2729 Add a 'create' helper function in test.sh.
2730 Add some basic assertions to test.sh.
2732 Trim some extra merge commits that don't need to go into the split tree.
2733 Only copy a commit if it has at least one nonidentical parent.
2734 test.sh: make sure no commit changes more than one file at a time.
2735 Simplify merges even more aggressively.
2736 test.sh: oops, never intended to count the raw number of commits.
2737 debug messages are off by default; use -d to enable.
2738 Abort if --rejoin fails.
2739 More to-do items based on feedback
2741 New --branch option to split command.
2742 slightly rearrange help message for split.
2743 FIXME help for --squash option
2744 merge_msg() is really more like rejoin_msg().
2745 Basic "subtree merge --squash" support.
2746 Don't squash-merge if the old and new commits are the same.
2747 Fix splitting after using a squash merge.
2748 Make --squash work with the 'add' command too.
2749 Add basic git-subtree manpage in asciidoc format.
2750 man page: add an EXAMPLES section.
2752 Some todo items reported by pmccurdy
2754 Docs: when pushing to github, the repo path needs to end in .git
2758 todo: idea for a 'git subtree grafts' command
2759 Improve patch to use git --exec-path: add to PATH instead.
2760 Fix behaviour if you have a branch named the same as your --prefix
2761 Add a README that says to email me instead of using github mail.
2762 If someone provides a --prefix that ends with slash, strip the slash.
2763 Fix a minor problem in identifying squashes vs. normal splits.
2764 cmd_pull didn't support --squash correctly.
2765 Add some tips for how to install.
2766 Oops, forgot a COPYING file. It's GPLv2.
2767 Weird, I forgot to have 'make test' call test.sh.
2768 Jakub's changes broke the progress message slightly.
2769 Make tests pass with recent git (1.7.0 and up).
2770 Improve checking for existence of the --prefix directory.
2771 Oops. Apparently I didn't run 'make test' after most recent change.
2772 Some recent tests accidentally depended on very new versions of git.
2773 (Hopefully) fix PATH setting for msysgit.
2774 Another fix for PATH and msysgit.
2776 Fix a few typos/grammar-o's in the preceding commit.
2777 It's also okay if an expected tree object is actually a commit.
2778 Skip commit objects that should be trees, rather than copying them.
2781 git-svn: support rebase --preserve-merges
2784 add installation support to Makefile
2785 make git version dynamic when building documentation
2786 Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd
2789 docs: simplify example 1
2791 Clemens Buchacher (2):
2792 merge overwrites unstaged changes in renamed file
2793 t5570: use explicit push refspec
2796 Fixing eval syntax error.
2799 docs: add simple 'add' case to clarify setup.
2800 Docs: cleaning up example textual redundancy
2802 David A. Greene (11):
2803 Move Tests Into Subdirectory
2807 Remove unnecessary git-subtree files
2808 Use project config files
2809 Use configure settings for git-subtree
2810 Install git-subtree from contrib
2811 Add subtree test Makefile
2812 Use git-subtree test Makefile
2813 Fix git-subtree install instructions
2816 t7800: Test difftool passing arguments to diff
2818 Felipe Contreras (8):
2819 tests: add initial bash completion tests
2820 completion: simplify __gitcomp_1
2821 completion: simplify by using $prev
2822 completion: add missing general options
2823 completion: simplify __git_complete_revlist_file
2824 completion: add new __git_complete helper
2825 completion: rename internal helpers _git and _gitk
2826 completion: add support for backwards compatibility
2829 Teach revision walking machinery to walk multiple times sequencially
2830 Refactor submodule push check to use string list instead of integer
2831 push: teach --recurse-submodules the on-demand option
2834 gitweb: Pass esc_html_hl_regions() options to esc_html()
2837 added -p alias for --prefix
2838 added -m/--message option for setting merge commit message
2839 allow using --branch with existing branches if it makes sense
2840 fix for subtree split not finding proper base for new commits
2841 changed alias for --prefix from -p to -P
2842 fixed bug in commit message for split
2843 added tests for recent changes
2844 added temporary test dirs to gitignore
2845 improved rev_is_descendant_of_branch() function
2848 apply: do not leak patches and fragments
2851 checkout: suppress tracking message with "-q"
2852 teach "git branch" a --quiet option
2853 doc/config: fix inline literals
2854 status: refactor colopts handling
2856 Jesse Greenwald (2):
2857 Split cmd now processes commits in topo order.
2858 Added check to order of processed commits.
2861 l10n: Update git.pot (33 new, 24 deleted messages)
2862 l10n: Update Simplified Chinese translation
2863 l10n: Update git.pot (275 new, 15 removed messages)
2864 l10n: Update git.pot (8 new, 4 removed messages)
2867 am: support --include option
2870 Do not use SHELL_PATH from build system in prepare_shell_cmd on Windows
2871 t4006: Windows do not have /dev/zero
2872 Fix t3411.3 to actually rebase something
2875 docs: Description, synopsys, options and examples changes.
2878 git-svn: clarify the referent of dcommit's optional argument
2879 rev-parse doc: --git-dir does not always show a relative path
2881 Jonathan Nieder (15):
2882 test: use test_i18ncmp when checking --stat output
2883 test: use numstat instead of diffstat in funny-names test
2884 test: modernize funny-names test style
2885 test: test cherry-pick functionality and output separately
2886 test: use --numstat instead of --stat in "git stash show" tests
2887 test: use numstat instead of diffstat in binary-diff test
2888 diffstat summary line varies by locale: miscellany
2889 var doc: default editor and pager are configurable at build time
2890 var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
2891 test: do not rely on US English tracking-info messages
2892 test: use test_i18ncmp for "Patch format detection failed" message
2893 test: am of empty patch should not succeed
2894 fast-import doc: cat-blob and ls responses need to be consumed quickly
2895 completion: avoid trailing space for --exec-path
2896 i18n: mark relative dates for translation
2898 Junio C Hamano (45):
2899 streaming: make streaming-write-entry to be more reusable
2900 fmt-merge-msg: show those involved in a merged series
2901 apply: rename free_patch() to free_patch_list()
2902 apply: free patch->{def,old,new}_name fields
2903 apply: release memory for fn_table
2904 apply: free patch->result
2905 am -3: list the paths that needed 3-way fallback
2906 apply: free unused fragments for submodule patch
2907 varint: make it available outside the context of pack
2908 cache.h: hide on-disk index details
2909 read-cache.c: allow unaligned mapping of the index file
2910 read-cache.c: make create_from_disk() report number of bytes it consumed
2911 read-cache.c: report the header version we do not understand
2912 read-cache.c: move code to copy ondisk to incore cache to a helper function
2913 read-cache.c: move code to copy incore to ondisk cache to a helper function
2914 read-cache.c: read prefix-compressed names in index on-disk version v4
2915 read-cache.c: write prefix-compressed names in the index
2916 update-index: upgrade/downgrade on-disk index version
2917 Kick off post 1.7.10 cycle
2918 apply: drop unused macro
2919 apply: tighten constness of line buffer
2920 apply: document buffer ownership rules across functions
2921 RelNotes: the first batch of topics graduated to 'master'
2922 RelNotes: the second batch of topics graduated to 'master'
2923 mergesort: rename it to llist_mergesort()
2924 RelNotes: the third batch
2925 RelNotes: the fourth batch of topics graduated to 'master'
2926 The fifth batch of topics graduated to 'master'
2927 push.default doc: explain simple after upstream
2928 Update draft release notes to 1.7.11
2929 The sixth batch of topics graduated to 'master'
2930 unpack-trees: preserve the index file version of original
2931 index-v4: document the entry format
2932 The seventh batch of topics graduated to 'master'
2933 git-svn: introduce SVN version comparison function
2934 The eighth batch of topics graduated to 'master'
2935 refs: fix find_containing_dir() regression
2936 Makefile: NO_INSTALL_HARDLINKS
2937 The ninth batch of topics graduated to 'master'
2938 The tenth batch of topics
2939 Update draft release notes to 1.7.11 (11th batch)
2940 Update draft release notes for 12th batch
2941 git-sh-setup: define workaround wrappers before they are used
2942 Update draft release notes to 1.7.11
2946 gitweb: Don't set owner if got empty value from projects.list
2947 gitweb: Option to omit column with time of the last change
2948 gitweb: Option to not display information about owner
2951 git p4: Fixing script editor checks
2952 git p4: import/export of labels to/from p4
2953 git p4: fix-up "import/export of labels to/from p4"
2954 git p4: Squash P4EDITOR in test harness
2955 git p4: Ignore P4EDITOR if it is empty
2956 git p4: move verbose to base class
2957 git p4: fix unit tests
2958 git p4: add test for tag import/export enabled via config
2959 git p4: fix bug when verbose enabled with tag export
2960 git p4: fix bug when enabling tag import/export via config variables
2963 l10n: pt_PT.po translate new messages
2966 Documentation: explain push.default option a bit more
2967 Undocument deprecated alias 'push.default=tracking'
2968 t5528-push-default.sh: add helper functions
2969 push: introduce new push.default mode "simple"
2970 push: document the future default change for push.default (matching -> simple)
2972 Matthijs Kooijman (1):
2973 git-svn: use platform specific auth providers
2975 Michael Haggerty (32):
2976 refs.c: reorder definitions more logically
2977 refs: manage current_ref within do_one_ref()
2978 do_for_each_ref_in_array(): new function
2979 do_for_each_ref_in_arrays(): new function
2980 repack_without_ref(): reimplement using do_for_each_ref_in_array()
2981 names_conflict(): simplify implementation
2982 free_ref_entry(): new function
2983 check_refname_component(): return 0 for zero-length components
2984 struct ref_entry: nest the value part in a union
2985 refs.c: rename ref_array -> ref_dir
2986 sort_ref_dir(): simplify logic
2987 refs: store references hierarchically
2988 do_for_each_ref(): only iterate over the subtree that was requested
2989 get_ref_dir(): return early if directory cannot be read
2990 get_ref_dir(): use a strbuf to hold refname
2991 get_ref_dir(): rename "base" parameter to "dirname"
2992 get_ref_dir(): require that the dirname argument ends in '/'
2993 refs.c: extract function search_for_subdir()
2994 get_ref_dir(): take the containing directory as argument
2995 do_for_each_reflog(): return early on error
2996 do_for_each_reflog(): use a strbuf to hold logfile name
2997 bisect: copy filename string obtained from git_path()
2998 find_containing_dir(): use strbuf in implementation of this function
2999 refs: wrap top-level ref_dirs in ref_entries
3000 read_loose_refs(): rename function from get_ref_dir()
3001 get_ref_dir(): add function for getting a ref_dir from a ref_entry
3002 search_for_subdir(): return (ref_dir *) instead of (ref_entry *)
3003 struct ref_dir: store a reference to the enclosing ref_cache
3004 read_loose_refs(): eliminate ref_cache argument
3005 refs: read loose references lazily
3006 t/Makefile: retain cache t/.prove across prove runs
3007 Avoid sorting if references are added to ref_cache in order
3009 Michael Schubert (1):
3010 remote: update builtin usage
3012 Michał Kiedrowicz (7):
3013 gitweb: Use descriptive names in esc_html_hl_regions()
3014 gitweb: esc_html_hl_regions(): Don't create empty <span> elements
3015 gitweb: Extract print_sidebyside_diff_lines()
3016 gitweb: Use print_diff_chunk() for both side-by-side and inline diffs
3017 gitweb: Push formatting diff lines to print_diff_chunk()
3018 gitweb: Highlight interesting parts of diff
3019 gitweb: Refinement highlightning in combined diffs
3022 git-cherry-pick: add allow-empty option
3023 git-cherry-pick: Add keep-redundant-commits option
3024 git-cherry-pick: Add test to validate new options
3025 git-rebase: add keep_empty flag
3026 git cherry-pick: do not dereference a potential NULL pointer
3028 Nguyễn Thái Ngọc Duy (37):
3029 Add more large blob test cases
3030 cat-file: use streaming API to print blobs
3031 parse_object: avoid putting whole blob in core
3032 show: use streaming API for showing blobs
3033 fsck: use streaming API for writing lost-found blobs
3034 update-server-info: respect core.bigfilethreshold
3035 Makefile: feed all header files to xgettext
3036 strbuf: convenience format functions with \n automatically appended
3037 i18n: help: mark strings for translation
3038 i18n: make warn_dangling_symref() automatically append \n
3039 i18n: remote: mark strings for translation
3040 i18n: apply: mark strings for translation
3041 i18n: apply: update say_patch_name to give translators complete sentence
3042 i18n: index-pack: mark strings for translation
3043 i18n: bundle: mark strings for translation
3044 help: replace underlining "help -a" headers using hyphens with a blank line
3045 Add column layout skeleton and git-column
3046 Stop starting pager recursively
3047 column: add columnar layout
3048 column: add dense layout support
3049 help: reuse print_columns() for help -a
3050 branch: add --column
3051 status: add --column
3052 column: support piping stdout to external git-column process
3054 archive-tar: turn write_tar_entry into blob-writing only
3055 archive-tar: unindent write_tar_entry by one level
3056 archive: delegate blob reading to backend
3057 archive-tar: stream large blobs to tar file
3058 branch: remove lego in i18n tracking info strings
3059 Makefile: keep many variable list sorted
3060 index-pack: restructure pack processing into three main functions
3061 index-pack: support multithreaded delta resolving
3062 index-pack: disable threading if NO_PREAD is defined
3063 apply: remove lego in i18n string in gitdiff_verify_name
3064 i18n: parseopt: lookup help and argument translations when showing usage
3065 i18n: apply: mark parseopt strings for translation
3068 Check that the type of the tree really is a tree and not a commit as it seems to sometimes become when eg. a submodule has existed in the same position previously.
3069 Use 'git merge -Xsubtree' when git version >= 1.7.0.
3070 Fixed regression with splitting out new subtree
3073 git-p4: move to toplevel
3074 git p4: update name in script
3075 git p4: use "git p4" directly in tests
3076 remove superfluous newlines in error messages
3077 remove blank filename in error message
3078 git p4: bring back files in deleted client directory
3080 git p4: fix writable file after rename or copy
3081 git p4: submit files with wildcards
3084 l10n: Update German translation
3087 Ramsay Allan Jones (5):
3088 compat/win32/pthread.h: Add an pthread_key_delete() implementation
3089 compat/mingw.h: Set S_ISUID to prevent a fast-import test failure
3090 git-submodule.sh: Don't use $path variable in eval_gettext string
3091 git-sh-setup.sh: Add an pwd() function for MinGW
3092 builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning
3095 add mergesort() for linked lists
3096 commit: use mergesort() in commit_list_sort_by_date()
3097 revision: insert unsorted, then sort in prepare_revision_walk()
3098 sequencer: export commit_list_append()
3099 revision: append to list instead of insert and reverse
3100 commit: remove commit_list_reverse()
3101 streaming: void pointer instead of char pointer
3102 archive-zip: remove uncompressed_size
3103 archive-zip: factor out helpers for writing sizes and CRC
3104 archive-zip: streaming for stored files
3105 archive-zip: streaming for deflated files
3106 t5000: rationalize unzip tests
3107 dir: convert to strbuf
3108 xdiff: add hunk_func()
3109 blame: use hunk_func(), part 1
3110 blame: use hunk_func(), part 2
3111 blame: factor out helper for calling xdi_diff()
3112 xdiff: remove emit_func() and xdi_diff_hunks()
3113 xdiff: remove unused functions
3114 dir: respect string length argument of read_directory_recursive()
3115 dir: simplify fill_directory()
3116 archive: simplify refname handling
3117 archive-tar: keep const in checksum calculation
3118 xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines
3119 xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines
3120 xdiff: import new 32-bit version of count_masked_bytes()
3123 git-svn: use POSIX::sigprocmask to block signals
3124 git-svn: ignore SIGPIPE
3125 git-svn: drop redundant blocking of SIGPIPE
3128 tests: add tests for the __gitcomp() completion helper function
3129 completion: fix completion after 'git --option <TAB>'
3131 Sebastian Pipping (1):
3132 gitweb: Fix unintended "--no-merges" for regular Atom feed
3134 Stefano Lattarini (3):
3135 configure: move definitions of private m4 macros before AC_INIT invocation
3136 configure: avoid some code repetitions thanks to m4_{push,pop}def
3137 configure: be more idiomatic
3140 xdiff: load full words in the inner loop of xdl_hash_record
3141 xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE
3144 difftool: parse options using Getopt::Long
3145 difftool: add '--no-gui' option
3146 difftool: exit(0) when usage is printed
3147 difftool: remove explicit change of PATH
3148 difftool: stop appending '.exe' to git
3149 difftool: eliminate setup_environment function
3150 difftool: teach difftool to handle directory diffs
3151 difftool: print list of valid tools with '--tool-help'
3154 gitweb: add `status` headers to git_feed() responses.
3155 gitweb: refactor If-Modified-Since handling
3156 gitweb: add If-Modified-Since handling to git_snapshot().
3159 Added new 'push' command and 2-parameter form of 'add'.
3162 git-subtree.txt: add another example.
3163 Make sure that <prefix> exists when splitting.
3165 Zbigniew Jędrzejewski-Szmek (13):
3166 t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER
3167 t0303: resurrect commit message as test documentation
3168 t1507: add tests to document @{upstream} behaviour
3169 Provide branch name in error message when using @{u}
3170 Provide better message for barnhc_wiht_tpyo@{u}
3171 Be more specific if upstream branch is not tracked
3172 i18n: mark @{upstream} error messages for translation
3173 t9002: work around shells that are unable to set COLUMNS to 1
3174 diff --stat: use less columns for change counts
3175 test: modernize style of t4006
3176 tests: check --[short]stat output after chmod
3177 diff --stat: report mode-only changes for binary files like text files
3178 diff --stat: do not run diff on indentical files
3181 Add explicit path of git installation by 'git --exec-path'.
3183 Ævar Arnfjörð Bjarmason (3):
3184 git-branch: remove lego in i18n messages
3185 git-commit: remove lego in i18n messages
3186 git-commit: remove lego in i18n messages
3189 Version v1.7.10.5; changes since v1.7.10.4:
3190 -------------------------------------------
3192 Johannes Schindelin (1):
3193 fast-export: report SHA-1 instead of gibberish when marks exist already
3198 Vincent van Ravesteijn (1):
3199 Do not autosquash in case of an implied interactive rebase
3202 Version v1.7.10.4; changes since v1.7.10.3:
3203 -------------------------------------------
3206 checkout: no progress messages if !isatty(2).
3209 rebase: report invalid commit correctly
3210 Makefile: add missing GIT-VERSION-FILE dependency
3213 fix off-by-one error in split_ident_line
3214 pretty: avoid buffer overflow in format_person_part
3215 avoid segfault when reading header of malformed commits
3218 Start preparing for 1.7.10.4
3222 Update Swedish translation (728t0f0u)
3225 grep: factor out create_grep_pat()
3226 grep: factor out do_append_grep_pat()
3227 grep: support newline separated pattern list
3228 grep: stop leaking line strings with -f
3231 Version v1.7.10.3; changes since v1.7.10.2:
3232 -------------------------------------------
3235 diff --no-index: reset temporary buffer lengths on directory iteration
3236 diff --no-index: don't leak buffers in queue_diff
3238 Carlos Martín Nieto (1):
3239 pack-protocol: fix first-want separator in the examples
3242 clone: fix progress-regression
3243 checkout: do not corrupt HEAD on empty repo
3246 link to gitmodules page at the beginning of git-submodule documentation
3247 teach add_submodule_odb() to look for alternates
3250 log-tree: use custom line terminator in line termination mode
3253 docs: stop using asciidoc no-inline-literal
3254 t1411: add more selector index/date tests
3255 log: respect date_mode_explicit with --format:%gd
3256 reflog-walk: clean up "flag" field of commit_reflog struct
3257 reflog-walk: always make HEAD@{0} show indexed selectors
3258 commit: refactor option parsing
3259 status: refactor null_termination option
3260 status: fix null termination with "-b"
3261 status: respect "-b" for porcelain format
3262 osxkeychain: pull make config from top-level directory
3265 Consistently use "superproject" instead of "supermodule"
3268 l10n: Update git.pot (1 new messages)
3269 l10n: zh_CN.po: translate 1 new message
3270 l10n: Update git.pot (3 new, 2 removed messages)
3271 l10n: zh_CN.po: translate 3 new messages
3274 t2020-checkout-detach: check for the number of orphaned commits
3275 checkout (detached): truncate list of orphaned commits at the new HEAD
3276 t3404: begin "exchange commits with -p" test with correct preconditions
3278 Jonathan Nieder (1):
3279 config doc: remove confusion about relative GIT_DIR from FILES section
3282 log-tree: the previous one is still not quite right
3283 reflog-walk: tell explicit --date=default from not having --date at all
3284 Start preparing for 1.7.10.3
3285 Update draft release notes to 1.7.10.3
3289 fmt-merge-message: add empty line between tag and signature verification
3292 l10n: add new members to German translation team
3293 l10n: de.po: translate "track" as "beobachten"
3294 l10n: de.po: translate "remote" as "extern"
3295 l10n: de.po: collection of improvements
3296 l10n: de.po: unify translation of "ahead" and "behind"
3297 l10n: de.po: translate one new message
3298 l10n: de.po: translate 3 new messages
3301 l10n: de.po: translate "bare" as "bloß"
3302 l10n: de.po: hopefully uncontroversial fixes
3303 l10n: de.po: translate "bad" as "ungültig" ("invalid")
3304 l10n: de.po: collection of suggestions
3307 Version v1.7.10.2; changes since v1.7.10.1:
3308 -------------------------------------------
3311 grep.c: remove redundant line of code
3314 Avoid bug in Solaris xpg4/sed as used in submodule
3316 Christian Couder (1):
3317 revert: add missing va_end
3319 Christopher Tiwald (2):
3320 push: Provide situational hints for non-fast-forward errors
3321 Fix httpd tests that broke when non-ff push advice changed
3323 Clemens Buchacher (3):
3324 http auth fails with multiple curl handles
3325 properly keep track of current working directory
3326 cherry-pick: do not expect file arguments
3328 Florian Achleitner (1):
3329 Documentation/git-config: describe and clarify "--local <file>" option
3332 document submdule.$name.update=none option for gitmodules
3335 clean up struct ref's nonfastforward field
3336 http-backend: respect existing GIT_COMMITTER_* variables
3337 fix http auth with multiple curl handles
3338 gc: do not explode objects which will be immediately pruned
3339 http: clean up leak in init_curl_http_auth
3340 http: use newer curl options for setting credentials
3341 argv-array: refactor empty_argv initialization
3342 argv-array: add a new "pushl" method
3343 gc: use argv-array for sub-commands
3344 config: reject bogus section names for --rename-section
3345 config: expand tildes in include.path variable
3346 send-pack: show progress when isatty(2)
3347 teach send-pack about --[no-]progress
3348 t5541: test more combinations of --progress
3349 t/gitweb-lib: use $PERL_PATH to run gitweb
3352 diff: avoid stack-buffer-read-overrun for very long name
3355 t9300-fast-import: avoid 'exit' in test_expect_success snippets
3356 t5570: fix forwarding of git-daemon messages via cat
3358 Junio C Hamano (13):
3359 xdiff: remove XDL_PATCH_* macros
3360 xdiff: PATIENCE/HISTOGRAM are not independent option bits
3361 rebase -i: remind that the lines are top-to-bottom
3362 builtin/merge.c: remove "remoteheads" global variable
3363 builtin/merge.c: collect other parents early
3364 builtin/merge.c: reduce parents early
3365 fmt-merge-msg: discard needless merge parents
3366 t9400: fix gnuism in grep
3367 diff --no-index: use strbuf for temporary pathnames
3368 contrib/rerere-train: use installed git-sh-setup
3369 Start preparing for 1.7.10.2
3370 Update draft release notes to 1.7.10.2
3374 Add output_prefix_length to diff_options
3375 Adjust stat width calculations to take --graph output into account
3376 t4052: Adjust --graph --stat output for prefixes
3377 t4052: Test diff-stat output with minimum columns
3378 Prevent graph_width of stat width from falling below min
3381 fetch: Give remote_ref to update_local_ref() as well
3382 fetch: describe new refs based on where it came from
3384 Michał Kiedrowicz (1):
3385 merge tests: octopus with redundant parents
3388 git-remote-testgit: fix race when spawning fast-import
3389 git p4 doc: fix formatting
3392 sequencer: remove additional blank line
3395 unpack-trees: don't perform any index operation if we're not merging
3396 unpack-trees: plug minor memory leak
3399 rev-parse --show-prefix: add in trailing newline
3400 stash: use eval_gettextln correctly
3402 Stefano Lattarini (1):
3403 tests: modernise style: more uses of test_line_count
3405 Zbigniew Jędrzejewski-Szmek (4):
3406 t4052: test --stat output with --graph
3407 test-lib: skip test with COLUMNS=1 under mksh
3408 t4052: work around shells unable to set COLUMNS to 1
3409 Consistently use perl from /usr/bin/ for scripts
3412 Version v1.7.10.1; changes since v1.7.10:
3413 -----------------------------------------
3416 git-commit.txt: clarify -t requires editing message
3419 l10n: New da.po file with 0 translations
3420 l10n: Add Danish team (da) to list of teams
3423 fetch-pack: new --stdin option to read refs from stdin
3424 remote-curl: send the refs to fetch-pack on stdin
3425 fetch-pack: test cases for the new --stdin option
3426 remote-curl: main test case for the OS command line overflow
3429 drop casts from users EMPTY_TREE_SHA1_BIN
3430 make is_empty_blob_sha1 available everywhere
3431 teach diffcore-rename to optionally ignore empty content
3432 merge-recursive: don't detect renames of empty files
3433 add--interactive: ignore unmerged entries in patch mode
3434 run-command: treat inaccessible directories as ENOENT
3437 submodules: recursive fetch also checks new tags for submodule commits
3440 l10n: Update git.pot (2 new messages)
3441 l10n: Update Simplified Chinese translation
3444 t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
3445 notes-merge: use opendir/readdir instead of using read_directory()
3446 notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
3449 t4034: diff.*.wordregex should not be "sticky" in --word-diff
3452 rebase -i continue: don't skip commits that only change submodules
3454 Jonathan Nieder (1):
3455 bundle: remove stray single-quote from error message
3457 Junio C Hamano (16):
3458 ident.c: add split_ident_line() to parse formatted ident line
3459 t7503: does pre-commit-hook learn authorship?
3460 commit: pass author/committer info to hooks
3461 remove_dir_recursively(): Add flag for skipping removal of toplevel dir
3462 clean: preserve nested git worktree in subdirectories
3463 t7501: test the right kind of breakage
3464 commit: do not trigger bogus "has templated message edited" check
3465 commit: rephrase the error when user did not touch templated log message
3466 Documentation/git-commit: rephrase the "initial-ness" of templates
3467 push: error out when the "upstream" semantics does not make sense
3468 blame: accept --need-minimal
3472 Start preparing for 1.7.10.1
3476 log --graph --stat: three-dash separator should come after graph lines
3477 log --graph: fix break in graph lines
3478 t4202: add test for "log --graph --stat -p" separator lines
3481 l10n: Updated pt_PT language
3484 fast-import: tighten parsing of datarefs
3487 l10n: Add the German translation team and initialize de.po
3488 l10n: Initial German translation
3490 Ramsay Allan Jones (1):
3491 compat/mingw.[ch]: Change return type of exec functions to int
3494 combine-diff: fix loop index underflow
3495 submodule: fix prototype of gitmodules_config
3496 test-subprocess: fix segfault without arguments
3499 diff: refactor the word-diff setup from builtin_diff_cmd
3500 diff: tweak a _copy_ of diff_options with word-diff
3503 Version v1.7.10; changes since v1.7.10-rc4:
3504 -------------------------------------------
3506 Felipe Contreras (1):
3507 spec: add missing build dependency
3513 Version v1.7.10-rc4; changes since v1.7.10-rc3:
3514 -----------------------------------------------
3517 string-list: document that string_list_insert() inserts unique strings
3520 l10n: Improve zh_CN translation for Git 1.7.10-rc3
3523 merge: backport GIT_MERGE_AUTOEDIT support
3528 l10n: Inital Portuguese Portugal language (pt_PT)
3531 gitk: fix tabbed preferences construction when using tcl 8.4
3532 gitk: fix setting font display with new tabbed dialog layout.
3535 config: remove useless assignment
3537 Vincent van Ravesteijn (1):
3538 l10n: Add the Dutch translation team and initialize nl.po
3541 Version v1.7.10-rc3; changes since v1.7.10-rc2:
3542 -----------------------------------------------
3544 Frédéric Brière (1):
3545 gitk: Skip over AUTHOR/COMMIT_DATE when searching all fields
3548 l10n: Update git.pot (1 new message)
3549 l10n: Update zh_CN translation for Git 1.7.10-rc1
3550 l10n: Review zh_CN translation for Git 1.7.10-rc1
3551 Add url of Swedish l10n team in TEAMS file
3554 gitk: Make "git describe" output clickable, too
3555 correct spelling: an URL -> a URL
3556 correct a few doubled-word nits in comments and documentation
3558 Jonathan Nieder (1):
3559 gitk: Use symbolic font names "sans" and "monospace" when available
3563 Update draft release notes to 1.7.10
3566 Marcus Karlsson (1):
3567 gitk: Teach gitk to respect log.showroot
3570 grep doc: add --break / --heading / -W to synopsis
3572 Nelson Benitez Leon (1):
3573 documentation: fix alphabetic ordered list for git-rebase man page
3576 gitk: Use a tabbed dialog to edit preferences
3577 gitk: Fix the display of files when filtered by path
3580 gitk: Speed up resolution of short SHA1 ids
3581 gitk: Add menu items for comparing a commit with the marked commit
3584 Update Swedish translation (724t0f0u).
3586 Rodrigo Silva (MestreLion) (1):
3587 Documentation: improve description of GIT_EDITOR and preference order
3589 Zbigniew Jędrzejewski-Szmek (2):
3590 gitk: Use "gitk: repo-top-level-dir" as window title
3591 tests: unset COLUMNS inherited from environment
3594 Version v1.7.10-rc2; changes since v1.7.10-rc1:
3595 -----------------------------------------------
3598 contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
3601 Documentation/gitweb: trivial English fixes
3603 Jonathan Nieder (2):
3604 fast-import: leakfix for 'ls' of dirty trees
3605 fast-import: don't allow 'ls' of path with empty components
3608 fetch/receive: remove over-pessimistic connectivity check
3609 Update draft release notes to 1.7.10
3610 .mailmap: unify various old mail addresses of gitster
3613 Stefano Lattarini (1):
3614 configure: allow user to prevent $PATH "sanitization" on Solaris
3617 Documentation/diff-options: reword description of --submodule option
3618 contrib/diffall: comment actual reason for 'cdup'
3619 contrib/diffall: create tmp dirs without mktemp
3620 contrib/diffall: eliminate use of tar
3621 contrib/diffall: eliminate duplicate while loops
3622 contrib/diffall: fix cleanup trap on Windows
3623 Documentation/difftool: add deltawalker to list of valid diff tools
3625 Ævar Arnfjörð Bjarmason (2):
3626 Git::I18N: compatibility with perl <5.8.3
3627 perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
3630 Version v1.7.10-rc1; changes since v1.7.10-rc0:
3631 -----------------------------------------------
3634 verify-tag: Parse GPG configuration options.
3637 gitweb: Fix fixed string (non-regexp) project search
3640 submodules: always use a relative path to gitdir
3641 submodules: always use a relative path from gitdir to work tree
3642 submodules: refactor computation of relative gitdir path
3645 l10n: Update zh_CN translation for 1.7.9.2
3646 l10n: Update git.pot (1 new message)
3647 l10n: Update zh_CN translation for 1.7.10-rc0
3650 submodules: fix ambiguous absolute paths under Windows
3653 Update draft release notes to 1.7.10
3654 t0204: clarify the "observe undefined behaviour" test
3655 i18n: fix auto detection of gettext scheme for shell scripts
3657 Update draft release notes to 1.7.10 before -rc1
3658 am: officially deprecate -b/--binary option
3662 fix deletion of .git/objects sub-directories in git-prune/repack
3664 Martin Stenberg (1):
3665 config: report errors at the EOL with correct line number
3668 po/sv.po: add Swedish translation
3669 Update Swedish translation (732t0f0u).
3672 rerere: Document 'rerere remaining'
3675 perf: load test-lib-functions from the correct directory
3676 perf: export some important test-lib variables
3677 p4000: use -3000 when promising -3000
3678 git-am: error out when seeing -b/--binary
3681 l10n: Improve zh_CN translation for lines insertion and deletion.
3682 l10n: Improve zh_CN translation for msg about branch deletion deny
3683 l10n: Improve zh_CN translation for empty cherry-pick msg.
3684 l10n: Improve zh_CN translation for msg that make empty commit when amend.
3685 l10n: Improve commit msg for zh_CN translation
3686 l10n: Improve zh_CN trans for msg that cannot fast-forward
3687 l10n: Improve zh_CN translation for msg "not something we can merge"
3689 Vincent van Ravesteijn (3):
3690 Documentation/git-branch: cleanups
3691 Documentation/git-branch: fix a typo
3692 Documentation/git-branch: add default for --contains
3695 Version v1.7.10-rc0; changes since v1.7.9.7:
3696 --------------------------------------------
3699 completion: --edit and --no-edit for git-merge
3702 add a Makefile switch to avoid gettext translation in shell scripts
3704 Bernhard R. Link (6):
3705 gitweb: move hard coded .git suffix out of git_get_projects_list
3706 gitweb: prepare git_get_projects_list for use outside 'forks'.
3707 gitweb: add project_filter to limit project list to a subdirectory
3708 gitweb: limit links to alternate forms of project_list to active project_filter
3709 gitweb: show active project_filter in project_list page header
3710 gitweb: place links to parent directories in page header
3712 Carlos Martín Nieto (1):
3713 Make git-{pull,rebase} message without tracking information friendlier
3715 Clemens Buchacher (3):
3716 git-daemon: add tests
3717 git-daemon: produce output when ready
3718 git-daemon tests: wait until daemon is ready
3721 vcs-svn: set up channel to read fast-import cat-blob response
3722 vcs-svn: quote paths correctly for ls command
3723 vcs-svn: use mark from previous import for parent commit
3724 vcs-svn: pass paths through to fast-import
3725 vcs-svn: drop string_pool
3727 vcs-svn: drop obj_pool
3728 vcs-svn: avoid using ls command twice
3729 vcs-svn: implement text-delta handling
3732 vcs-svn: do not initialize report_buffer twice
3733 vcs-svn: reset first_commit_done in fast_export_init
3735 Felipe Contreras (4):
3736 remote: use a local variable in match_push_refs()
3737 remote: reorganize check_pattern_match()
3738 remote: refactor code into alloc_delete_ref()
3739 push: add '--prune' option
3741 Frédéric Heitzmann (1):
3742 completion: add --interactive option to git svn dcommit
3744 Jakub Narębski (11):
3745 gitweb: improve usability of projects search form
3746 gitweb: Make project search respect project_filter
3747 gitweb: Harden and improve $project_filter page title
3748 gitweb: Refactor checking if part of project info need filling
3749 gitweb: Option for filling only specified info in fill_project_list_info
3750 gitweb: Faster project search
3751 gitweb: Introduce esc_html_match_hl and esc_html_hl_regions
3752 gitweb: Highlight matched part of project name when searching projects
3753 gitweb: Highlight matched part of project description when searching projects
3754 gitweb: Highlight matched part of shortened project description
3755 gitweb: Fix passing parameters to git_project_search_form
3758 symbolic-ref --short: abbreviate the output unambiguously
3761 Add threaded versions of functions in symlinks.c.
3764 parse_object: try internal cache before reading object db
3765 upload-pack: avoid parsing objects during ref advertisement
3766 upload-pack: avoid parsing tag destinations
3767 t0300: use write_script helper
3768 docs: add a basic description of the config API
3769 drop odd return value semantics from userdiff_config
3770 diff-highlight: make perl strict and warnings fatal
3771 diff-highlight: don't highlight whole lines
3772 diff-highlight: refactor to prepare for multi-line hunks
3773 diff-highlight: match multi-line hunks
3774 diff-highlight: document some non-optimal cases
3775 docs/api-config: minor clarifications
3776 t1300: add missing &&-chaining
3777 config: copy the return value of prefix_filename
3778 config: teach git_config_set_multivar_in_file a default path
3779 config: teach git_config_rename_section a file argument
3780 config: provide a version of git_config with more options
3781 config: stop using config_exclusive_filename
3782 config: eliminate config_exclusive_filename
3783 config: add include directive
3786 Add a setting to require a filter to be successful
3789 test-lib: add the test_pause convenience function
3792 l10n: initial git.pot for 1.7.10 upcoming release
3794 l10n: Update git.pot (12 new messages)
3795 l10n: update Chinese translation to the new git.po
3796 Update l10n guide: change the repository URL, etc
3798 Jonathan Nieder (23):
3799 vcs-svn: use higher mark numbers for blobs
3800 vcs-svn: save marks for imported commits
3801 vcs-svn: add a comment before each commit
3802 vcs-svn: eliminate repo_tree structure
3803 vcs-svn: handle filenames with dq correctly
3804 Makefile: list one vcs-svn/xdiff object or header per line
3805 vcs-svn: learn to maintain a sliding view of a file
3806 vcs-svn: make buffer_read_binary API more convenient
3807 vcs-svn: skeleton of an svn delta parser
3808 vcs-svn: parse svndiff0 window header
3809 vcs-svn: read the preimage when applying deltas
3810 vcs-svn: read inline data from deltas
3811 vcs-svn: read instructions from deltas
3812 vcs-svn: implement copyfrom_data delta instruction
3813 vcs-svn: verify that deltas consume all inline data
3814 vcs-svn: let deltas use data from postimage
3815 vcs-svn: let deltas use data from preimage
3816 test-svn-fe: split off "test-svn-fe -d" into a separate function
3817 vcs-svn: cap number of bytes read from sliding view
3818 vcs-svn: guard against overflow when computing preimage length
3819 vcs-svn: avoid hangs from corrupt deltas
3820 vcs-svn: allow import of > 4GiB files
3821 vcs-svn: suppress a -Wtype-limits warning
3823 Junio C Hamano (28):
3824 git-sh-i18n: restructure the logic to compute gettext.sh scheme
3825 i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n
3826 merge: use editor by default in interactive sessions
3827 push: do not let configured foreign-vcs permanently clobbered
3828 t9801: do not overuse test_must_fail
3829 i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT
3830 vcs-svn/svndiff.c: squelch false "unused" warning from gcc
3831 Kick off the post 1.7.9 cycle
3832 Update draft release notes to 1.7.10
3833 Update draft release notes to 1.7.10
3834 Update draft release notes to 1.7.10
3835 Update draft release notes to 1.7.10
3836 Update draft release notes to 1.7.10
3837 Update draft release notes to 1.7.10
3838 t9100: remove bogus " || test" after each test scriptlet
3839 merge: do not trust fstat(2) too much when checking interactiveness
3840 Update draft release notes to 1.7.10
3841 Update draft release notes to 1.7.10
3842 Update draft release notes to 1.7.10
3843 grep: use static trans-case table
3844 fsck: --no-dangling omits "dangling object" information
3845 pickaxe: allow -i to search in patch case-insensitively
3847 diff --stat: tests for long filenames and big change counts
3848 Update draft release notes to 1.7.10
3849 Update draft release notes to 1.7.10
3850 fsck doc: a minor typofix
3854 "git pull" doesn't know "--edit"
3857 git-p4: handle p4 branches and labels containing shell chars
3858 git-p4: cope with labels with empty descriptions
3859 git-p4: importing labels should cope with missing owner
3860 git-p4: add test for p4 labels
3861 git-p4: label import fails with multiple labels at the same changelist
3862 git-p4: add initial support for RCS keywords
3864 Michael Haggerty (11):
3865 pack_refs(): remove redundant check
3866 ref_array: keep track of whether references are sorted
3867 add_packed_ref(): new function in the refs API.
3868 write_remote_refs(): create packed (rather than extra) refs
3869 t5700: document a failure of alternates to affect fetch
3870 clone.c: move more code into the "if (refs)" conditional
3871 fetch-pack.c: rename some parameters from "path" to "refname"
3872 fetch-pack.c: inline insert_alternate_refs()
3873 everything_local(): mark alternate refs as complete
3874 clone: do not add alternate references to extra_refs
3875 refs: remove the extra_refs API
3877 Michał Kiedrowicz (2):
3878 pack-objects: Fix compilation with NO_PTHREDS
3879 grep -P: add tests for matching ^ and $
3881 Nelson Benitez Leon (1):
3882 http: support proxies that require authentication
3884 Nguyễn Thái Ngọc Duy (20):
3885 clone: add --single-branch to fetch only one branch
3886 Fix incorrect ref namespace check
3887 Eliminate recursion in setting/clearing marks in commit list
3888 index-pack: eliminate recursion in find_unresolved_deltas
3889 index-pack: eliminate unlimited recursion in get_base_data()
3890 t5601: add missing && cascade
3891 clone: write detached HEAD in bare repositories
3892 clone: factor out checkout code
3893 clone: factor out HEAD update code
3894 clone: factor out remote ref writing
3895 clone: delay cloning until after remote HEAD checking
3896 clone: --branch=<branch> always means refs/heads/<branch>
3897 clone: refuse to clone if --branch points to bogus ref
3898 clone: allow --branch to take a tag
3899 clone: print advice on checking out detached HEAD
3900 clone: fix up delay cloning conditions
3901 pack-objects: do not accept "--index-version=version,"
3902 pack-objects: remove bogus comment
3903 pack-objects: convert to use parse_options()
3904 cache-tree: update API to take abitrary flags
3907 git-p4: only a single ... wildcard is supported
3908 git-p4: fix verbose comment typo
3909 git-p4: clarify comment
3910 git-p4: adjust test to adhere to stricter useClientSpec
3911 git-p4: add tests demonstrating spec overlay ambiguities
3912 git-p4: Change p4 command invocation
3915 cherry-pick: No advice to commit if --no-commit
3917 Philip Jägenstedt (2):
3918 completion: remote set-* <name> and <branch>
3919 completion: normalize increment/decrement style
3921 Ramkumar Ramachandra (2):
3922 revert: prepare to move replay_action to header
3923 sequencer: factor code out of revert builtin
3925 Ramsay Allan Jones (3):
3926 vcs-svn: rename check_overflow arguments for clarity
3927 builtin/tag.c: Fix a sparse warning
3928 ctype.c: Fix a sparse warning
3931 xdiff: print post-image for common records instead of pre-image
3932 test-parse-options: convert to OPT_BOOL()
3933 parse-options: allow positivation of options starting, with no-
3934 parse-options: remove PARSE_OPT_NEGHELP
3935 parse-options: typo check for unknown switches
3938 l10n: update zh_CN translation for "Fetching %s"
3941 git-p4: the option to specify 'host' is -H, not -h
3943 Stefano Lattarini (1):
3944 t0000: modernise style
3947 git-svn.perl: perform deletions before anything else
3948 git-svn.perl: fix a false-positive in the "already exists" test
3951 am: learn passing -b to mailinfo
3952 mailinfo: with -b, keep space after [foo]
3953 Move the user-facing test library to test-lib-functions.sh
3954 Introduce a performance testing framework
3955 Add a performance test for git-grep
3956 perf: compare diff algorithms
3959 contrib: add git-diffall script
3960 mergetools: add a plug-in to support DeltaWalker
3963 tag: add --points-at list option
3966 git-p4: Search for parent commit on branch creation
3967 git-p4: Add test case for complex branch import
3969 Wei-Yin Chen (陳威尹) (1):
3970 git-svn: Fix time zone in --localtime
3973 l10n: fast-forward here is ff-only merge, not push
3975 Zbigniew Jędrzejewski-Szmek (11):
3976 make lineno_width() from blame reusable for others
3977 send-email: document the --smtp-debug option
3978 git-p4: missing she-bang line in t9804 confuses prove
3979 diff --stat: use the full terminal width
3980 show --stat: use the full terminal width
3981 log --stat: use the full terminal width
3982 merge --stat: use the full terminal width
3983 diff --stat: use a maximum of 5/8 for the filename part
3984 diff --stat: add a test for output with COLUMNS=40
3985 diff --stat: enable limiting of the graph part
3986 diff --stat: add config option to limit graph width
3989 l10n: leave leading space unchanged for zh_CN.po
3991 Ævar Arnfjörð Bjarmason (2):
3992 git-svn: remove redundant porcelain option to rev-list
3993 git-svn: un-break "git svn rebase" when log.abbrevCommit=true
3996 Version v1.7.9.7; changes since v1.7.9.6:
3997 -----------------------------------------
4000 Documentation/gitweb: trivial English fixes
4002 Jonathan Nieder (1):
4003 bundle: remove stray single-quote from error message
4006 fetch/receive: remove over-pessimistic connectivity check
4012 Version v1.7.9.6; changes since v1.7.9.5:
4013 -----------------------------------------
4016 string-list: document that string_list_insert() inserts unique strings
4019 merge: backport GIT_MERGE_AUTOEDIT support
4023 Version v1.7.9.5; changes since v1.7.9.4:
4024 -----------------------------------------
4027 gitweb: Fix actionless dispatch for non-existent objects
4029 Jonathan Nieder (2):
4030 fast-import: leakfix for 'ls' of dirty trees
4031 fast-import: don't allow 'ls' of path with empty components
4034 i18n of multi-line advice messages
4038 t/Makefile: Use $(sort ...) explicitly where needed
4041 grep doc: add --break / --heading / -W to synopsis
4043 Martin Stenberg (1):
4044 config: report errors at the EOL with correct line number
4046 Nelson Benitez Leon (1):
4047 documentation: fix alphabetic ordered list for git-rebase man page
4050 rerere: Document 'rerere remaining'
4052 Rodrigo Silva (MestreLion) (1):
4053 Documentation: improve description of GIT_EDITOR and preference order
4056 Version v1.7.9.4; changes since v1.7.9.3:
4057 -----------------------------------------
4060 gitweb: Fix fixed string (non-regexp) project search
4063 am -3: allow nonstandard -p<num> option
4064 test: "am -3" can accept non-standard -p<num>
4065 t4011: modernise style
4066 t4011: illustrate "diff-index -p" on stat-dirty paths
4067 diff -p: squelch "diff --git" header for stat-dirty paths
4071 t5510: refactor bundle->pack conversion
4072 t5510: ensure we stay in the toplevel test dir
4073 bundle: keep around names passed to add_pending_object()
4074 Document the --histogram diff option
4075 t5704: fix nonportable sed/grep usages
4078 Version v1.7.9.3; changes since v1.7.9.2:
4079 -----------------------------------------
4082 rebase -m: only call "notes copy" when rewritten exists and is non-empty
4084 Carlos Martín Nieto (2):
4085 branch: don't assume the merge filter ref exists
4086 Documentation: use {asterisk} in rev-list-options.txt when needed
4088 Clemens Buchacher (1):
4089 http.proxy: also mention https_proxy and all_proxy
4091 Dmitry V. Levin (1):
4092 Makefile: add thread-utils.h to LIB_H
4095 gitweb: Fix "heads" view when there is no current branch
4096 gitweb: Handle invalid regexp in regexp search
4099 disconnect from remote helpers more gently
4100 teach convert_to_git a "dry run" mode
4101 teach dry-run convert_to_git not to require a src buffer
4102 do not stream large files to pack when filters are in use
4105 Ignore SIGPIPE when running a filter driver
4108 am: don't infloop for an empty input file
4110 John Szakmeister (1):
4111 configure: don't use -lintl when there is no gettext support
4113 Jonathan Nieder (1):
4114 mergetools/meld: Use --help output to detect --output support
4117 refresh_index: do not show unmerged path that is outside pathspec
4118 Documentation/merge-options.txt: group "ff" related options together
4119 Document merge.branchdesc configuration variable
4121 Document accumulated fixes since 1.7.9.2
4122 Update draft release notes to 1.7.9.3
4123 Documentation: do not assume that n > 1 in <rev>~$n
4124 Update draft release notes to 1.7.9.3 for the last time
4128 Documentation fixes in git-config
4131 README: point to Documentation/SubmittingPatches
4133 Michael Haggerty (2):
4134 post-receive-email: remove unused variable
4135 post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly
4137 Michael J Gruber (1):
4138 t0300: work around bug in dash 0.5.6
4140 Michał Kiedrowicz (1):
4141 grep -P: Fix matching ^ and $
4143 Nguyễn Thái Ngọc Duy (2):
4144 rev-list: remove BISECT_SHOW_TRIED flag
4145 rev-list: fix --verify-objects --quiet becoming --objects
4148 git-p4: set useClientSpec variable on initial clone
4149 git-p4: fix submit regression with clientSpec and subdir clone
4150 git-p4: remove bash-ism in t9809
4151 git-p4: remove bash-ism in t9800
4153 Philip Jägenstedt (1):
4154 remote: fix set-branches usage and documentation
4156 Stefano Lattarini (1):
4157 tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh
4160 merge: add instructions to the commit message when editing
4161 bundle: put strbuf_readline_fd in strbuf.c with adjustments
4162 bundle: use a strbuf to scan the log for boundary commits
4163 strbuf: improve strbuf_get*line documentation
4164 t5704: match tests to modern style
4165 fast-import: zero all of 'struct tag' to silence valgrind
4168 CodingGuidelines: Add a note about spaces after redirection
4169 CodingGuidelines: do not use 'which' in shell scripts
4172 t5512 (ls-remote): modernize style
4175 Version v1.7.9.2; changes since v1.7.9.1:
4176 -----------------------------------------
4178 Christian Hammerl (1):
4179 completion: Allow dash as the first character for __git_ps1
4181 Clemens Buchacher (4):
4182 git rev-list: fix invalid typecast
4183 push/fetch/clone --no-progress suppresses progress output
4184 t5541: check error message against the real port number used
4185 do not override receive-pack errors
4187 Felipe Contreras (3):
4188 completion: work around zsh option propagation bug
4189 completion: use ls -1 instead of rolling a loop to do that ourselves
4190 completion: simplify __gitcomp and __gitcomp_nl implementations
4193 gitweb: Allow UTF-8 encoded CGI query parameters and path_info
4194 gitweb: Fix 'grep' search for multiple matches in file
4197 grep: make locking flag global
4198 grep: move sha1-reading mutex into low-level code
4199 grep: refactor the concept of "grep source" into an object
4200 convert git-grep to use grep_source interface
4201 grep: drop grep_buffer's "name" parameter
4202 grep: cache userdiff_driver in grep_source
4203 grep: respect diff attributes for binary-ness
4204 grep: load file data after checking binary-ness
4205 grep: pre-load userdiff drivers when threaded
4206 standardize and improve lookup rules for external local repos
4207 prompt: clean up strbuf usage
4208 prompt: fall back to terminal if askpass fails
4211 i18n: git-commit whence_s "merge/cherry-pick" message
4212 i18n: format_tracking_info "Your branch is behind" message
4215 Makefile: fix syntax for older make
4218 mailmap: always return a plain mail address from map_user()
4219 git checkout -b: allow switching out of an unborn branch
4220 commit: ignore intent-to-add entries instead of refusing
4221 diff --stat: show bars of same length for paths with same amount of changes
4222 Update draft release notes to 1.7.9.2
4223 Update draft release notes to 1.7.9.2
4224 Update draft release notes to 1.7.9.2
4228 fsck: give accurate error message on empty loose object files
4231 ctype.c only wants git-compat-util.h
4232 ctype: implement islower/isupper macro
4234 Nguyễn Thái Ngọc Duy (3):
4235 sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry()
4236 find_pack_entry(): do not keep packed_git pointer locally
4237 Use correct grammar in diffstat summary line
4239 Philip Jägenstedt (2):
4240 completion: remove stale "to submit patches" documentation
4241 completion: use tabs for indentation
4244 completion: --edit-description option for git-branch
4245 completion: --list option for git-branch
4248 Fix build problems related to profile-directed optimization
4250 Zbigniew Jędrzejewski-Szmek (2):
4251 pager: find out the terminal width before spawning the pager
4252 man: rearrange git synopsis to fit in 80 lines
4255 Makefile: introduce CHARSET_LIB to link with -lcharset
4258 Version v1.7.9.1; changes since v1.7.9:
4259 ---------------------------------------
4262 completion: --edit and --no-edit for git-merge
4265 grep: fix -l/-L interaction with decoration lines
4268 Drop system includes from inet_pton/inet_ntop compatibility wrappers
4270 Clemens Buchacher (2):
4271 fix push --quiet: add 'quiet' capability to receive-pack
4272 dashed externals: kill children on exit
4275 mergetool: Provide an empty file when needed
4278 git.spec: Workaround localized messages not put in any RPM
4281 run-command: optionally kill children on exit
4282 imap-send: remove dead code
4283 tag: fix output of "tag -n" when errors occur
4284 tag: die when listing missing or corrupt objects
4287 submodule add: fix breakage when re-adding a deep submodule
4289 Johannes Schindelin (1):
4290 add -e: do not show difference in a submodule that is merely dirty
4292 Junio C Hamano (15):
4293 server_supports(): parse feature list more carefully
4294 Making pathspec limited log play nicer with --first-parent
4295 request-pull: explicitly ask tags/$name to be pulled
4296 tests: add write_script helper function
4297 parse_date(): allow ancient git-timestamp
4298 parse_date(): '@' prefix forces git-timestamp
4299 merge: do not create a signed tag merge under --ff-only option
4300 branch --edit-description: protect against mistyped branch name
4303 tag: do not show non-tag contents with "-n"
4304 merge: do not launch an editor on "--no-edit $tag"
4305 Update draft release notes to 1.7.9.1
4306 Update draft release notes to 1.7.9.1
4309 Michael J Gruber (1):
4310 t5541: avoid TAP test miscounting
4312 Michael Palimaka (1):
4313 Explicitly set X to avoid potential build breakage
4315 Shawn O. Pearce (1):
4316 remote-curl: Fix push status report when all branches fail
4318 Ævar Arnfjörð Bjarmason (3):
4319 Makefile: Change the default compiler from "gcc" to "cc"
4320 Remove Git's support for smoke testing
4321 t: use sane_unset instead of unset
4324 Version v1.7.9; changes since v1.7.9-rc2:
4325 -----------------------------------------
4327 Felipe Contreras (1):
4328 git-completion: workaround zsh COMPREPLY bug
4331 docs: minor grammar fixes for v1.7.9 release notes
4334 INSTALL: warn about recent Fedora breakage
4337 Michael Haggerty (1):
4338 Fix typo in 1.7.9 release notes
4341 Version v1.7.9-rc2; changes since v1.7.9-rc1:
4342 ---------------------------------------------
4345 gitweb: Fix file links in "grep" search
4346 gitweb: Harden "grep" search against filenames with ':'
4349 unix-socket: handle long socket pathnames
4350 credential-cache: report more daemon connection errors
4351 credential-cache: ignore "connection refused" errors
4353 Jonathan Nieder (1):
4354 unix-socket: do not let close() or chdir() clobber errno during cleanup
4357 pulling signed tag: add howto document
4362 Michael Haggerty (2):
4363 git-show-ref: fix escaping in asciidoc source
4364 git-show-ref doc: typeset regexp in fixed width font
4366 Nguyễn Thái Ngọc Duy (3):
4367 Document limited recursion pathspec matching with wildcards
4368 diff-index: enable recursive pathspec matching in unpack_trees
4369 diff-index: enable recursive pathspec matching in unpack_trees
4372 word-diff: ignore '\ No newline at eof' marker
4375 Version v1.7.9-rc1; changes since v1.7.9-rc0:
4376 ---------------------------------------------
4379 Use perl instead of sed for t8006-blame-textconv test
4381 Carlos Martín Nieto (1):
4382 archive: re-allow HEAD:Documentation on a remote invocation
4384 Clemens Buchacher (1):
4385 credentials: unable to connect to cache daemon
4388 send-email: multiedit is a boolean config option
4389 attr: don't confuse prefixes with leading directories
4390 attr: drop misguided defensive coding
4391 attr: fix leak in free_attr_elem
4392 thin-pack: try harder to use preferred base objects as base
4394 Junio C Hamano (11):
4395 attr.c: make bootstrap_attr_stack() leave early
4396 attr.c: clarify the logic to pop attr_stack
4397 Documentation: rerere's rr-cache auto-creation and rerere.enabled
4401 request-pull: use the real fork point when preparing the message
4402 Update draft release notes to 1.7.6.6
4403 Update draft release notes to 1.7.7.6
4404 Update draft release notes to 1.7.8.4
4408 gitweb: accept trailing "/" in $project_list
4410 Michael Haggerty (3):
4411 receive-pack: move more work into write_head_info()
4412 show_ref(): remove unused "flag" and "cb_data" arguments
4413 write_head_info(): handle "extra refs" locally
4415 Nguyễn Thái Ngọc Duy (1):
4416 t2203: fix wrong commit command
4418 Sebastian Schuberth (2):
4419 t9200: On MSYS, do not pass Windows-style paths to CVS
4420 git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS
4423 mailinfo documentation: accurately describe non -k case
4426 Version v1.7.9-rc0; changes since v1.7.8.6:
4427 -------------------------------------------
4430 gitk: Remove unused $cdate array
4431 gitk: Remember time zones from author and commit timestamps
4434 git-gui: fix multi selected file operation
4435 git-gui: handle config booleans without value
4436 git-gui: add smart case search mode in searchbar
4437 git-gui: add regexp search mode to the searchbar
4438 git-gui: add search history to searchbar
4439 git-gui: fix unintended line break in message string
4440 git-gui: use "untracked" for files which are not known to git
4441 git-gui: new config to control staging of untracked files
4442 git-gui: fix display of path in browser title
4443 git-gui: use a tristate to control the case mode in the searchbar
4444 git-gui: span widgets over the full file output area in the blame view
4445 git-gui: include the file path in guitools confirmation dialog
4446 git-gui: make config gui.warndetachedcommit a boolean
4447 git-gui: don't warn for detached head when rebasing
4450 git-gui: fix spelling error in sshkey.tcl
4453 git-p4: ensure submit clientPath exists before chdir
4454 git-p4: use absolute directory for PWD env var
4455 git-p4: fix test for unsupported P4 Client Views
4456 git-p4: sort client views by reverse View number
4457 git-p4: support single file p4 client view maps
4460 Add built-in diff patterns for MATLAB code
4463 gitweb: Refactor diff body line classification
4464 gitweb: Extract formatting of diff chunk header
4465 gitweb: Give side-by-side diff extra CSS styling
4466 t9500: Add test for handling incomplete lines in diff by gitweb
4467 t9500: Add basic sanity tests for side-by-side diff in gitweb
4468 gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"
4471 prune: handle --progress/no-progress
4472 reachable: per-object progress
4473 upload-archive: use start_command instead of fork
4474 test-lib: add test_config_global variant
4476 introduce credentials API
4477 credential: add function for parsing url components
4478 http: use credential API to get passwords
4479 credential: apply helper config
4480 credential: add credential.*.username
4481 credential: make relevance of http path configurable
4482 docs: end-user documentation for the credential subsystem
4483 credentials: add "cache" helper
4484 strbuf: add strbuf_add*_urlencode
4485 imap-send: avoid buffer overflow
4486 imap-send: don't check return value of git_getpass
4487 move git_getpass to its own source file
4488 refactor git_getpass into generic prompt function
4489 add generic terminal prompt function
4490 credentials: add "store" helper
4491 prompt: use git_terminal_prompt
4492 t: add test harness for external credential helpers
4493 credential: use git_prompt instead of git_getpass
4494 Makefile: linux has /dev/tty
4495 Makefile: OS X has /dev/tty
4496 contrib: add credential helper for OS X Keychain
4497 test-lib: redirect stdin of tests
4498 pretty: give placeholders to reflog identity
4501 write first for-merge ref to FETCH_HEAD first
4504 Makefile: unix sockets may not available on some platforms
4506 Jonathan Nieder (6):
4507 gitk: Make vi-style keybindings more vi-like
4508 test: add missing "&&" after echo command
4509 test: remove a porcelain test that hard-codes commit names
4510 t7501 (commit): modernize style
4511 test: commit --amend should honor --no-edit
4512 test: errors preparing for a test are not special
4515 stash: Don't fail if work dir contains file named 'HEAD'
4517 Junio C Hamano (50):
4518 branch: add read_branch_desc() helper function
4519 format-patch: use branch description in cover letter
4520 branch: teach --edit-description option
4521 request-pull: modernize style
4522 request-pull: state what commit to expect
4523 request-pull: use the branch description
4524 fmt-merge-msg: use branch.$name.description
4525 write_pack_header(): a helper function
4526 create_tmp_packfile(): a helper function
4527 finish_tmp_packfile(): a helper function
4528 Split GPG interface into its own helper library
4529 merge: notice local merging of tags and keep it unwrapped
4530 fetch: allow "git fetch $there v1.0" to fetch a tag
4531 refs DWIMmery: use the same rule for both "git fetch" and others
4532 fmt-merge-msg: avoid early returns
4533 fmt-merge-msg: package options into a structure
4534 fmt-merge-msg: Add contents of merged tag in the merge message
4535 merge: make usage of commit->util more extensible
4536 merge: record tag objects without peeling in MERGE_HEAD
4537 request-pull: use the annotated tag contents
4538 commit: copy merged signed tags to headers of merge commit
4539 merge: force edit and no-ff mode when merging a tag object
4540 commit: teach --amend to carry forward extra headers
4541 commit-tree: update the command line parsing
4542 commit-tree: teach -m/-F options to read logs from elsewhere
4543 commit: teach --gpg-sign option
4544 log: --show-signature
4545 test "commit -S" and "log --show-signature"
4546 pretty: %G[?GS] placeholders
4547 gpg-interface: allow use of a custom GPG binary
4548 csum-file: introduce sha1file_checkpoint
4549 bulk-checkin: replace fast-import based implementation
4550 Kick-off the 1.7.9 cycle
4551 commit: honour --no-edit
4552 Update draft release notes for 1.7.9
4553 Update draft release notes to 1.7.9
4554 request-pull: update the "pull" command generation logic
4555 Update draft release notes to 1.7.9
4556 request-pull: do not emit "tag" before the tagname
4557 Update draft release notes to 1.7.9
4558 commit: do not lose mergetag header when not amending
4559 Update draft release notes to 1.7.9
4560 Update draft release notes in preparation for 1.7.9-rc0
4561 Update draft release notes to 1.7.9
4562 verify_signed_buffer: fix stale comment
4563 commit --amend -S: strip existing gpgsig headers
4564 log-tree.c: small refactor in show_signature()
4565 log-tree: show mergetag in log --show-signature output
4566 log --show-signature: reword the common two-head merge case
4570 gitweb: Add a feature to show side-by-side diff
4571 gitweb: Add navigation to select side-by-side diff
4573 Kirill A. Shutemov (1):
4574 git-tag: introduce --cleanup option
4577 fetch: do not store peeled tag object names in FETCH_HEAD
4579 Martin von Zweigbergk (10):
4580 gitk: Fix file highlight when run in subdirectory
4581 gitk: Fix "show origin of this line" with separate work tree
4582 gitk: Fix "blame parent commit" with separate work tree
4583 gitk: Fix "External diff" with separate work tree
4584 gitk: Put temporary directory inside .git
4585 gitk: Run 'git rev-parse --git-dir' only once
4586 gitk: Simplify calculation of gitdir
4587 gitk: Show modified files with separate work tree
4588 t3401: modernize style
4589 t3401: use test_commit in setup
4591 Michael Haggerty (16):
4592 struct ref_entry: document name member
4593 refs: rename "refname" variables
4594 refs: rename parameters result -> sha1
4595 clear_ref_array(): rename from free_ref_array()
4596 is_refname_available(): remove the "quiet" argument
4597 parse_ref_line(): add docstring
4598 add_ref(): add docstring
4599 is_dup_ref(): extract function from sort_ref_array()
4600 refs: change signatures of get_packed_refs() and get_loose_refs()
4601 get_ref_dir(): change signature
4602 resolve_gitlink_ref(): improve docstring
4603 Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
4604 resolve_gitlink_ref_recursive(): change to work with struct ref_cache
4605 repack_without_ref(): remove temporary
4606 create_ref_entry(): extract function from add_ref()
4607 add_ref(): take a (struct ref_entry *) parameter
4609 Nguyễn Thái Ngọc Duy (14):
4610 fsck: return error code when verify_pack() goes wrong
4611 verify_packfile(): check as many object as possible in a pack
4612 fsck: avoid reading every object twice
4613 fsck: print progress
4614 prune: show progress while marking reachable objects
4615 Convert many resolve_ref() calls to read_ref*() and ref_exists()
4616 checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
4617 Copy resolve_ref() return value for longer use
4618 revert: convert resolve_ref() to read_ref_full()
4619 Convert resolve_ref+xstrdup to new resolve_refdup function
4620 Rename resolve_ref() to resolve_ref_unsafe()
4621 merge: abort if fails to commit
4622 Convert commit_tree() to take strbuf as message
4623 commit_tree(): refuse commit messages that contain NULs
4626 git-gui: include the number of untracked files to stage when asking the user
4627 git-gui: theme the search and line-number entry fields on blame screen
4628 git-gui: catch invalid or complete regular expressions and treat as no match.
4629 git-gui: enable the smart case sensitive search only if gui.search.smartcase is true
4630 git-gui: set suitable extended window manager hints.
4631 git-gui: support underline style when parsing diff output
4632 git-gui: sort the numeric ansi codes
4633 git-gui: set whitespace warnings appropriate to this project
4634 git-gui: added config gui.gcwarning to disable the gc hint message
4635 git-gui: handle shell script text filters when loading for blame.
4639 gitk: Update copyright
4642 git-p4: introduce skipSubmitEdit
4643 git-p4: submit test for auto-creating clientPath
4644 git-p4: test for absolute PWD problem
4645 git-p4: fix skipSubmitEdit regression
4647 git-p4: introduce asciidoc documentation
4648 git-p4: clone does not use --git-dir
4649 git-p4: test cloning with two dirs, clarify doc
4650 git-p4: document and test clone --branch
4651 git-p4: honor --changesfile option and test
4652 git-p4: document and test --import-local
4653 git-p4: test --max-changes
4654 git-p4: test --keep-path
4655 git-p4: test and document --use-client-spec
4656 git-p4: document and test submit options
4657 git-p4: test client view handling
4658 git-p4: rewrite view handling
4659 git-p4: view spec documentation
4661 Ramkumar Ramachandra (11):
4662 t3200 (branch): fix '&&' chaining
4663 test: fix '&&' chaining
4664 t3030 (merge-recursive): use test_expect_code
4665 t1510 (worktree): fix '&&' chaining
4666 t3040 (subprojects-basic): fix '&&' chaining, modernize style
4667 revert: free msg in format_todo()
4668 revert: make commit subjects in insn sheet optional
4669 revert: tolerate extra spaces, tabs in insn sheet
4670 revert: simplify getting commit subject in format_todo()
4671 t3510 (cherry-pick-sequencer): use exit status
4672 t3502, t3510: clarify cherry-pick -m failure
4674 Ramsay Allan Jones (3):
4675 builtin/log.c: Fix an "Using plain integer as NULL pointer" warning
4676 environment.c: Fix an sparse "symbol not declared" warning
4677 fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
4679 Raphael Zimmerer (1):
4680 gitk: When a commit contains a note, mark it with a yellow box
4683 read-cache.c: allocate index entries individually
4684 cache.h: put single NUL at end of struct cache_entry
4685 use struct sha1_array in diff_tree_combined()
4686 pass struct commit to diff_tree_combined_merge()
4687 submodule: use diff_tree_combined_merge() instead of diff_tree_combined()
4690 completion: document __gitcomp()
4691 completion: optimize refs completion
4692 completion: make refs completion consistent for local and remote repos
4693 completion: improve ls-remote output filtering in __git_refs()
4694 completion: support full refs from remote repositories
4695 completion: query only refs/heads/ in __git_refs_remotes()
4696 completion: improve ls-remote output filtering in __git_refs_remotes()
4697 completion: fast initial completion for config 'remote.*.fetch' value
4698 completion: remove broken dead code from __git_heads() and __git_tags()
4701 git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming.
4704 git-svn.perl: close the edit for propedits even with no mods
4707 grep: load funcname patterns for -W
4708 grep: enable threading with -p and -W using lazy attribute lookup
4709 grep: disable threading in non-worktree case
4710 test-terminal: set output terminals to raw mode
4711 bash completion: use read -r everywhere
4714 git-gui: add config value gui.diffopts for passing additional diff options
4716 Vincent van Ravesteijn (4):
4717 Compile fix for MSVC: Do not include sys/resources.h
4718 Compile fix for MSVC: Include <io.h>
4719 MSVC: Remove unneeded header stubs
4720 Show error for 'git merge' with unset merge.defaultToUpstream
4723 gitk: Make "touching paths" search support backslashes
4725 Ævar Arnfjörð Bjarmason (5):
4726 pull: introduce a pull.rebase option to enable --rebase
4727 i18n: add infrastructure for translating Git with gettext
4728 Fix an enum assignment issue spotted by Sun Studio
4729 Fix a bitwise negation assignment issue spotted by Sun Studio
4730 Appease Sun Studio by renaming "tmpfile"
4733 Version v1.7.8.6; changes since v1.7.8.5:
4734 -----------------------------------------
4736 Carlos Martín Nieto (1):
4737 Documentation: use {asterisk} in rev-list-options.txt when needed
4739 Clemens Buchacher (1):
4740 t5541: check error message against the real port number used
4743 Documentation/gitweb: trivial English fixes
4746 gitweb: Fix actionless dispatch for non-existent objects
4749 t0090: be prepared that 'wc -l' writes leading blanks
4751 Jonathan Nieder (1):
4752 bundle: remove stray single-quote from error message
4755 i18n of multi-line advice messages
4756 fetch/receive: remove over-pessimistic connectivity check
4761 t/Makefile: Use $(sort ...) explicitly where needed
4764 rerere: Document 'rerere remaining'
4766 Shawn O. Pearce (1):
4767 remote-curl: Fix push status report when all branches fail
4770 Add test-scrap-cache-tree
4771 Test the current state of the cache-tree optimization
4772 Refactor cache_tree_update idiom from commit
4773 commit: write cache-tree data when writing index anyway
4774 reset: update cache-tree data when appropriate
4775 bundle: put strbuf_readline_fd in strbuf.c with adjustments
4776 bundle: use a strbuf to scan the log for boundary commits
4777 strbuf: improve strbuf_get*line documentation
4778 t5704: match tests to modern style
4779 t5510: refactor bundle->pack conversion
4780 t5510: ensure we stay in the toplevel test dir
4781 bundle: keep around names passed to add_pending_object()
4782 Document the --histogram diff option
4785 Version v1.7.8.5; changes since v1.7.8.4:
4786 -----------------------------------------
4789 rebase -m: only call "notes copy" when rewritten exists and is non-empty
4791 Dmitry V. Levin (1):
4792 Makefile: add thread-utils.h to LIB_H
4795 imap-send: remove dead code
4798 am: don't infloop for an empty input file
4804 Michał Kiedrowicz (1):
4805 grep -P: Fix matching ^ and $
4808 Version v1.7.8.4; changes since v1.7.8.3:
4809 -----------------------------------------
4812 send-email: multiedit is a boolean config option
4813 attr: don't confuse prefixes with leading directories
4814 attr: drop misguided defensive coding
4815 attr: fix leak in free_attr_elem
4816 thin-pack: try harder to use preferred base objects as base
4818 Junio C Hamano (11):
4819 attr.c: make bootstrap_attr_stack() leave early
4820 attr.c: clarify the logic to pop attr_stack
4821 Documentation: rerere's rr-cache auto-creation and rerere.enabled
4825 Update draft release notes to 1.7.6.6
4826 Update draft release notes to 1.7.7.6
4827 Update draft release notes to 1.7.8.4
4831 Nguyễn Thái Ngọc Duy (2):
4832 t2203: fix wrong commit command
4833 diff-index: enable recursive pathspec matching in unpack_trees
4836 Version v1.7.8.3; changes since v1.7.8.2:
4837 -----------------------------------------
4840 fix hang in git fetch if pointed at a 0 length bundle
4842 Clemens Buchacher (2):
4843 Documentation: read-tree --prefix works with existing subtrees
4844 t5550: repack everything into one file
4847 Add MYMETA.json to perl/.gitignore
4850 gitweb: Fix fallback mode of to_utf8 subroutine
4853 docs: describe behavior of relative submodule URLs
4858 Jürgen Kreileder (3):
4859 gitweb: Call to_utf8() on input string in chop_and_escape_str()
4860 gitweb: esc_html() site name for title in OPML
4861 gitweb: Output valid utf8 in git_blame_common('data')
4863 Nguyễn Thái Ngọc Duy (1):
4864 Catch invalid --depth option passed to clone or fetch
4867 Documentation: rerere.enabled is the primary way to configure rerere
4870 Version v1.7.8.2; changes since v1.7.8.1:
4871 -----------------------------------------
4874 rebase -i: interrupt rebase when "commit --amend" failed during "reword"
4877 Update documentation for stripspace
4880 enable SO_KEEPALIVE for connected TCP sockets
4883 compat/setenv.c: update errno when erroring out
4884 compat/setenv.c: error if name contains '='
4887 read-cache: let refresh_cache_ent pass up changed flags
4888 refresh_index: rename format variables
4889 refresh_index: make porcelain output more specific
4890 compat/snprintf: don't look at va_list twice
4891 docs: mention "-k" for both forms of "git mv"
4892 mv: honor --verbose flag
4893 mv: make non-directory destination error more clear
4894 mv: improve overwrite warning
4895 mv: be quiet about overwriting
4896 drop "match" parameter from get_remote_heads
4897 t5500: give fully-qualified refs to fetch-pack
4898 fetch-pack: match refs exactly
4899 connect.c: drop path_match function
4900 t5540: test DAV push with authentication
4901 http-push: enable "proactive auth"
4902 use custom rename score during --follow
4903 docs: brush up obsolete bits of git-fsck manpage
4904 make "git push -v" actually verbose
4905 commit, merge: initialize static strbuf
4906 remote-curl: don't pass back fake refs
4908 Jelmer Vernooij (1):
4909 Fix an incorrect reference to --set-all.
4912 t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
4913 t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
4914 fast-import: Fix incorrect fanout level when modifying existing notes refs
4917 Compatibility: declare strtoimax() under NO_STRTOUMAX
4919 Jonathan Nieder (9):
4920 branch: allow a no-op "branch -M <current-branch> HEAD"
4921 Allow checkout -B <current-branch> to update the current branch
4922 revert: give --continue handling its own function
4923 revert: allow cherry-pick --continue to commit before resuming
4924 revert: pass around rev-list args in already-parsed form
4925 revert: allow single-pick in the middle of cherry-pick sequence
4926 revert: do not remove state until sequence is finished
4927 Revert "reset: Make reset remove the sequencer state"
4928 revert: stop creating and removing sequencer-old directory
4931 checkout -m: no need to insist on having all 3 stages
4932 checkout_merged(): squelch false warning from some gcc
4933 lf_to_crlf_filter(): resurrect CRLF->CRLF hack
4934 advice: Document that they all default to true
4938 Add strtoimax() compatibility function.
4939 Support sizes >=2G in various config options accepting 'g' sizes.
4942 Test 'checkout -m -- path'
4945 imap-send: Remove unused 'use_namespace' variable
4948 git-sh-setup: make require_clean_work_tree part of the interface
4950 Ævar Arnfjörð Bjarmason (1):
4951 t/t2023-checkout-m.sh: fix use of test_must_fail
4954 Version v1.7.8.1; changes since v1.7.8:
4955 ---------------------------------------
4958 t/t4131-apply-fake-ancestor.sh: fix broken test
4959 builtin/apply.c: report error on failure to recognize input
4961 Carlos Martín Nieto (2):
4962 convert: track state in LF-to-CRLF filter
4963 clone: the -o option has nothing to do with <branch>
4966 mingw: give waitpid the correct signature
4969 Documentation: fix formatting error in merge-options.txt
4972 http: drop "local" member from request struct
4973 archive: don't let remote clients get unreachable commits
4974 stripspace: fix outdated comment
4975 fetch: create status table using strbuf
4976 blame: don't overflow time buffer
4979 diff/status: print submodule path when looking for changes fails
4982 get_tree_entry(): do not call find_tree_entry() on an empty tree
4983 unpack_object_header_buffer(): clear the size field upon error
4984 receive-pack, fetch-pack: reject bogus pack that records objects twice
4985 pack-object: tolerate broken packs that have duplicated objects
4988 Update draft release notes for 1.7.8.1
4989 lf_to_crlf_filter(): tell the caller we added "\n" when draining
4992 Martin von Zweigbergk (1):
4993 am: don't persist keepcr flag
4995 Michael Haggerty (1):
4996 git symbolic-ref: documentation fix
4998 Michael Schubert (2):
4999 builtin/commit: add missing '/' in help message
5000 builtin/log: remove redundant initialization
5003 http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping
5004 http.c: Use timeout suggested by curl instead of fixed 50ms timeout
5005 http.c: Rely on select instead of tracking whether data was received
5007 Nguyễn Thái Ngọc Duy (5):
5008 tree-walk.c: do not leak internal structure in tree_entry_len()
5009 read_directory_recursive: reduce one indentation level
5010 tree_entry_interesting(): give meaningful names to return values
5011 tree_entry_interesting: make use of local pointer "item"
5012 checkout,merge: loosen overwriting untracked file check based on info/exclude
5015 Add MYMETA.yml to perl/.gitignore
5018 userdiff: allow * between cpp funcname words
5020 Ævar Arnfjörð Bjarmason (3):
5021 apply: get rid of useless x < 0 comparison on a size_t type
5022 cast variable in call to free() in builtin/diff.c and submodule.c
5023 builtin/init-db.c: eliminate -Wformat warning on Solaris
5026 Version v1.7.8; changes since v1.7.8-rc4:
5027 -----------------------------------------
5033 Version v1.7.8-rc4; changes since v1.7.8-rc3:
5034 ---------------------------------------------
5037 Fix revert --abort on Windows
5039 Jonathan Nieder (11):
5040 do not let git_path clobber errno when reporting errors
5041 notes merge: eliminate OUTPUT macro
5042 Makefile: add missing header file dependencies
5043 Makefile: add option to disable automatic dependency generation
5044 revert: rename --reset option to --quit
5045 revert: rearrange pick_revisions() for clarity
5046 revert: improve error message for cherry-pick during cherry-pick
5047 revert: write REVERT_HEAD pseudoref during conflicted revert
5048 revert: introduce --abort to cancel a failed cherry-pick
5049 revert: remove --reset compatibility option
5050 revert --abort: do not leave behind useless sequencer-old directory
5053 name-rev --all: do not even attempt to describe non-commit object
5055 Hopefully final update of release notes before 1.7.8 final
5056 Update 1.7.8 draft release notes in preparation for rc4
5059 Marc-André Lureau (1):
5060 mailmap: xcalloc mailmap_info
5062 Nguyễn Thái Ngọc Duy (1):
5063 revert: do not pass non-literal string as format to git_path()
5065 Ramkumar Ramachandra (4):
5066 http: remove unused function hex()
5067 convert: don't mix enum with int
5068 sha1_file: don't mix enum with int
5069 git-compat-util: don't assume value for undefined variable
5071 Ramsay Allan Jones (3):
5072 t5501-*.sh: Fix url passed to clone in setup test
5073 config.c: Fix a static buffer overwrite bug by avoiding mkpath()
5074 convert.c: Fix return type of git_path_check_eol()
5076 Thomas Hochstein (1):
5077 documentation fix: git difftool uses diff tools, not merge tools.
5079 Vincent van Ravesteijn (2):
5080 builtin-branch: Fix crash on invalid use of --force
5081 builtin-reset: Documentation update
5084 Version v1.7.8-rc3; changes since v1.7.8-rc2:
5085 ---------------------------------------------
5088 Revert "upload-archive: use start_command instead of fork"
5089 refs: loosen over-strict "format" check
5092 Ramkumar Ramachandra (1):
5093 revert: prettify fatal messages
5096 Version v1.7.8-rc2; changes since v1.7.8-rc1:
5097 ---------------------------------------------
5099 Felipe Contreras (1):
5100 remote: fix remote set-url usage
5103 docs: don't mention --quiet or --exit-code in git-log(1)
5106 remote: fix set-branches usage
5107 docs: Update install-doc-quick
5109 Update draft release notes to 1.7.8
5113 mktree: fix a memory leak in write_tree()
5116 completion: don't leak variable from the prompt into environment
5119 Version v1.7.8-rc1; changes since v1.7.8-rc0:
5120 ---------------------------------------------
5123 pack-objects: mark add_to_write_order() as inline
5124 pack-objects: use unsigned int for counter and offset values
5125 pack-objects: rewrite add_descendants_to_write_order() iteratively
5126 pack-objects: don't traverse objects unnecessarily
5129 mingw: move poll out of sys-folder
5130 compat/win32/poll.c: upgrade from upstream
5131 upload-archive: use start_command instead of fork
5132 mingw: poll.h is no longer in sys/
5135 name-hash.c: always initialize dir_next pointer
5138 (squash) test for previous
5140 Update draft release notes to 1.7.8
5141 receive-pack: do not expect object 0{40} to exist
5144 Nguyễn Thái Ngọc Duy (2):
5145 pretty.c: free get_header() return value
5146 pretty.c: use original commit message if reencoding fails
5149 t7511: avoid use of reserved filename on Windows.
5152 git-p4: ignore apple filetype
5154 Sebastian Schuberth (2):
5155 blame.c: Properly initialize strbuf after calling, textconv_object()
5156 blame.c: Properly initialize strbuf after calling textconv_object(), again
5159 t3200: add test case for 'branch -m'
5160 http: don't always prompt for password
5163 branch -m: handle no arg properly
5166 svn: Quote repository root in regex match
5168 Ævar Arnfjörð Bjarmason (2):
5169 t/t6030-bisect-porcelain.sh: use test_i18ngrep
5170 t/t7508-status.sh: use test_i18ncmp
5173 Version v1.7.8-rc0; changes since v1.7.7.7:
5174 -------------------------------------------
5177 grep: do not use --index in the short usage output
5178 grep --no-index: don't use git standard exclusions
5179 git-gui: search and linenumber input are mutual exclusive in the blame view
5180 git-gui: only accept numbers in the goto-line input
5181 git-gui: clear the goto line input when hiding
5182 git-gui: incremental goto line in blame view
5183 grep: fix the error message that mentions --exclude
5186 submodule: Demonstrate known breakage during recursive merge
5187 submodule: Search for merges only at end of recursive merge
5190 t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
5191 git-stash.sh: fix typo in error message
5192 t/t3905: add missing '&&' linkage
5193 git-stash: remove untracked/ignored directories when stashed
5194 refs.c: ensure struct whose member may be passed to realloc is initialized
5195 refs.c: abort ref search if ref array is empty
5196 refs.c: free duplicate entries in the ref array instead of leaking them
5197 t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir script
5199 Carlos Martín Nieto (1):
5200 Documentation: update [section.subsection] to reflect what git does
5203 git-web--browse: avoid the use of eval
5205 Christoffer Pettersson (1):
5206 git-gui: Corrected a typo in the Swedish translation of 'Continue'
5208 Clemens Buchacher (5):
5209 remove prefix argument from pathspec_prefix
5210 rename pathspec_prefix() to common_prefix() and move to dir.[ch]
5211 send-email: add option -h
5212 use -h for synopsis and --help for manpage consistently
5213 use test number as port number
5216 Add Git::config_path()
5217 use new Git::config_path() for aliasesfile
5218 send-email: Fix %config_path_settings handling
5221 tree-walk: drop unused parameter from match_dir_prefix
5222 tree-walk: micro-optimization in tree_entry_interesting
5225 Makefile: Improve compiler header dependency check
5228 git-gui: Enable jumping to a specific line number in blame view.
5229 git-gui: Add keyboard shortcuts for search and goto commands in blame view.
5232 Fix typo: existant->existent
5233 fast-import: don't allow to tag empty branch
5234 fast-import: don't allow to note on empty branch
5237 gitweb: Add gitweb.conf(5) manpage for gitweb configuration files
5240 enter_repo: do not modify input
5241 mingw: avoid using strbuf in syslog
5243 Fredrik Gustafsson (2):
5244 rev-parse: add option --resolve-git-dir <path>
5245 Move git-dir for submodules
5247 Fredrik Kuivinen (1):
5248 Makefile: Use computed header dependencies if the compiler supports it
5250 Frédéric Heitzmann (1):
5251 git svn dcommit: new option --interactive.
5253 Giuseppe Bilotta (1):
5254 am: preliminary support for hg patches
5257 git-gui: warn when trying to commit on a detached head
5258 submodule: move update configuration variable further up
5259 add update 'none' flag to disable update of submodule by default
5260 git-gui: deal with unknown files when pressing the "Stage Changed" button
5263 sha1_file: normalize alt_odb path before comparing and storing
5266 gitweb: Add gitweb(1) manpage for gitweb itself
5267 Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages
5268 Documentation: Add gitweb config variables to git-config(1)
5269 gitweb: Add gitweb manpages to 'gitweb' package in git.spec
5270 Add simple test for Git::config_path() in t/t9700-perl-git.sh
5273 Teach '--cached' option to check-attr
5275 revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
5276 cherry-pick: do not give irrelevant advice when cherry-pick punted
5277 Teach merge the '[-e|--edit]' option
5280 url: decode buffers that are not NUL-terminated
5281 improve httpd auth tests
5282 remote-curl: don't retry auth failures with dumb protocol
5283 http: retry authentication failures for all http requests
5284 t7004: factor out gpg setup
5285 t6300: add more body-parsing tests
5286 for-each-ref: refactor subject and body placeholder parsing
5287 for-each-ref: handle multiline subjects like --pretty
5288 t3200: clean up checks for file existence
5289 fix phantom untracked files when core.ignorecase is set
5290 t1300: put git invocations inside test function
5291 t1300: test mixed-case variable retrieval
5292 pack-objects: protect against disappearing packs
5293 downgrade "packfile cannot be accessed" errors to warnings
5294 daemon: give friendlier error messages to clients
5295 http_init: accept separate URL parameter
5296 contrib: add diff highlight script
5297 tests: add missing executable bits
5298 contrib: add git-jump script
5299 completion: match ctags symbol names in grep patterns
5302 Add a remote helper to interact with mediawiki (fetch & push)
5304 Johannes Schindelin (5):
5305 Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile
5306 t1020: disable the pwd test on MinGW
5307 t9001: do not fail only due to CR/LF issues
5308 t9300: do not run --cat-blob-fd related tests on MinGW
5309 git grep: be careful to use mutexes only when they are initialized
5312 t1402-check-ref-format: skip tests of refs beginning with slash on Windows
5313 t1300: attempting to remove a non-existent .git/config is not an error
5315 Jonathan Nieder (3):
5316 ident: check /etc/mailname if email is unknown
5317 ident: do not retrieve default ident when unnecessary
5318 Makefile: fix permissions of mergetools/ checked out with permissive umask
5320 Julian Phillips (2):
5321 Don't sort ref_list too early
5322 refs: Use binary search to lookup refs faster
5324 Junio C Hamano (47):
5325 rev-list: fix finish_object() call
5326 revision.c: add show_object_with_name() helper function
5327 revision.c: update show_object_with_name() without using malloc()
5328 list-objects: pass callback data to show_objects()
5329 rev-list --verify-object
5330 fetch: verify we have everything we need before updating our ref
5331 fetch.fsckobjects: verify downloaded objects
5332 transfer.fsckobjects: unify fetch/receive.fsckobjects
5333 test: fetch/receive with fsckobjects
5334 consolidate pathspec_prefix and common_prefix
5335 fetch: verify we have everything we need before updating our ref
5336 check_everything_connected(): refactor to use an iterator
5337 check_everything_connected(): libify
5338 receive-pack: check connectivity before concluding "git push"
5339 builtin/revert.c: make commit_list_append() static
5340 refs.c: make create_cached_refs() static
5341 send-pack: typofix error message
5342 rename "match_refs()" to "match_push_refs()"
5343 Allow git merge ":/<pattern>"
5344 ls-remote: a lone "-h" is asking for help
5345 t0003: remove extra whitespaces
5346 parse-options: deprecate OPT_BOOLEAN
5347 archive.c: use OPT_BOOL()
5348 url.c: simplify is_url()
5349 grep: teach --untracked and --exclude-standard options
5350 Post 1.7.7 first wave
5351 Update draft release notes to 1.7.8
5352 refs.c: move dwim_ref()/dwim_log() from sha1_name.c
5353 Update draft release notes to 1.7.8
5354 bundle: allowing to read from an unseekable fd
5355 bundle: add parse_bundle_header() helper function
5356 Update draft release notes to 1.7.8
5357 t7800: avoid arithmetic expansion notation
5358 Update draft release notes to 1.7.8
5359 resolve_gitlink_packed_ref(): fix mismerge
5360 Update draft release notes to 1.7.8
5361 Makefile: ask "ls-files" to list source files if available
5362 libperl-git: refactor Git::config_*
5363 Update draft release notes to 1.7.8
5364 resolve_ref(): expose REF_ISBROKEN flag
5365 resolve_ref(): report breakage to the caller without warning
5366 Update draft release notes to 1.7.8
5367 builtin/grep: make lock/unlock into static inline functions
5368 builtin/grep: simplify lock_and_read_sha1_file()
5369 Update draft release notes to 1.7.8
5370 Update draft release notes to 1.7.8
5374 git-p4: handle files with shell metacharacters
5377 gitweb: provide a way to customize html headers
5380 git-remote-mediawiki: allow push to set MediaWiki metadata
5381 git-remote-mediawiki: trivial fixes
5382 git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts
5383 git-remote-mediawiki: obey advice.pushNonFastForward
5384 git-remote-mediawiki: allow a domain to be set for authentication
5385 git-remote-mediawiki: don't include HTTP login/password in author
5387 Michael Haggerty (36):
5388 Extract a function clear_cached_refs()
5389 Access reference caches only through new function get_cached_refs()
5390 Change the signature of read_packed_refs()
5391 Allocate cached_refs objects dynamically
5392 Store the submodule name in struct cached_refs
5393 Retain caches of submodule refs
5394 get_sha1_hex(): do not read past a NUL character
5395 t1402: add some more tests
5396 git check-ref-format: add options --allow-onelevel and --refspec-pattern
5397 Change bad_ref_char() to return a boolean value
5398 Change check_ref_format() to take a flags argument
5399 Refactor check_refname_format()
5400 Do not allow ".lock" at the end of any refname component
5401 Make collapse_slashes() allocate memory for its result
5402 Inline function refname_format_print()
5403 Change check_refname_format() to reject unnormalized refnames
5404 resolve_ref(): explicitly fail if a symlink is not readable
5405 resolve_ref(): use prefixcmp()
5406 resolve_ref(): only follow a symlink that contains a valid, normalized refname
5407 resolve_ref(): turn buffer into a proper string as soon as possible
5408 resolve_ref(): extract a function get_packed_ref()
5409 resolve_ref(): do not follow incorrectly-formatted symbolic refs
5410 remote: use xstrdup() instead of strdup()
5411 remote: avoid passing NULL to read_ref()
5412 resolve_ref(): verify that the input refname has the right format
5413 resolve_ref(): emit warnings for improperly-formatted references
5414 resolve_ref(): also treat a too-long SHA1 as invalid
5415 resolve_ref(): expand documentation
5416 add_ref(): verify that the refname is formatted correctly
5417 invalidate_ref_cache(): rename function from invalidate_cached_refs()
5418 invalidate_ref_cache(): take the submodule as parameter
5419 invalidate_ref_cache(): expose this function in the refs API
5420 clear_ref_cache(): rename parameter
5421 clear_ref_cache(): extract two new functions
5422 write_ref_sha1(): only invalidate the loose ref cache
5423 clear_ref_cache(): inline function
5425 Michael J Gruber (7):
5426 t6040: test branch -vv
5427 git-tag: introduce long forms for the options
5428 git-branch: introduce missing long forms for the options
5429 branch: introduce --list option
5430 branch: allow pattern arguments
5431 branch: -v does not automatically imply --list
5432 http: use hostname in credential description
5434 Michael W. Olson (1):
5435 git-svn: Allow certain refs to be ignored
5438 for-each-ref: add split message parts to %(contents:*).
5440 Nguyễn Thái Ngọc Duy (6):
5441 sparse checkout: show error messages when worktree shaping fails
5442 Add explanation why we do not allow to sparse checkout to empty working tree
5443 pack-protocol: document "ERR" line
5444 daemon: return "access denied" if a service is not allowed
5445 daemon: log errors if we could not use some sockets
5446 t5403: convert leading spaces to tabs
5449 receive-pack: don't pass non-existent refs to post-{receive,update} hooks
5452 git-gui: updated translator README for current procedures.
5453 Fix tooltip display with multiple monitors on windows.
5454 git-gui: drop the 'n' and 'Shift-n' bindings from the last patch.
5455 mergetools: use the correct tool for Beyond Compare 3 on Windows
5456 mingw: ensure sockets are initialized before calling gethostname
5457 t9901: fix line-ending dependency on windows
5460 git-p4 tests: refactor and cleanup
5461 git-p4: handle utf16 filetype properly
5462 git-p4: recognize all p4 filetypes
5463 git-p4: stop ignoring apple filetype
5464 git-p4: keyword flattening fixes
5466 Peter Oberndorfer (1):
5467 "rebase -i": support special-purpose editor to edit insn sheet
5470 Learn to handle gitfiles in enter_repo
5471 Teach transport about the gitfile mechanism
5472 Add test showing git-fetch groks gitfiles
5474 Ramkumar Ramachandra (18):
5475 advice: Introduce error_resolve_conflict
5476 config: Introduce functions to write non-standard file
5477 revert: Simplify and inline add_message_to_msg
5478 revert: Don't check lone argument in get_encoding
5479 revert: Rename no_replay to record_origin
5480 revert: Eliminate global "commit" variable
5481 revert: Introduce struct to keep command-line options
5482 revert: Separate cmdline parsing from functional code
5483 revert: Don't create invalid replay_opts in parse_args
5484 revert: Save data for continuing after conflict resolution
5485 revert: Save command-line options for continuing operation
5486 revert: Make pick_commits functionally act on a commit list
5487 revert: Introduce --reset to remove sequencer state
5488 reset: Make reset remove the sequencer state
5489 revert: Remove sequencer state when no commits are pending
5490 revert: Don't implicitly stomp pending sequencer operation
5491 revert: Introduce --continue to continue the operation
5492 revert: Propagate errors upwards from do_pick_commit
5494 Ramsay Allan Jones (5):
5495 Makefile: Make dependency directory creation less noisy
5496 sparse: Fix an "Using plain integer as NULL pointer" warning
5497 obstack.c: Fix some sparse warnings
5498 Fix some "variable might be used uninitialized" warnings
5499 gitweb/Makefile: Remove static/gitweb.js in the clean target
5502 parseopt: add OPT_NOOP_NOARG
5503 revert: use OPT_NOOP_NOARG
5504 apply: use OPT_NOOP_NOARG
5505 checkout: check for "Previous HEAD" notice in t2020
5506 revision: factor out add_pending_sha1
5507 checkout: use add_pending_{object,sha1} in orphan check
5508 revision: add leak_pending flag
5509 bisect: use leak_pending flag
5510 bundle: use leak_pending flag
5511 checkout: use leak_pending flag
5512 commit: factor out clear_commit_marks_for_object_array
5514 test-ctype: add test for is_pathspec_magic
5515 name-rev: split usage string
5516 pickaxe: plug diff filespec leak with empty needle
5517 pickaxe: plug regex leak
5518 pickaxe: plug regex/kws leak
5519 pickaxe: factor out has_changes
5520 pickaxe: pass diff_options to contains and has_changes
5521 pickaxe: give diff_grep the same signature as has_changes
5522 pickaxe: factor out pickaxe
5523 xdiff: factor out get_func_line()
5524 diff: add option to show whole functions as context
5527 completion: unite --reuse-message and --reedit-message for 'notes'
5528 completion: unite --format and --pretty for 'log' and 'show'
5530 Sebastian Schuberth (2):
5531 git-svn: On MSYS, escape and quote SVN_SSH also if set by the user
5532 inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables
5534 Sitaram Chamarty (1):
5535 git-difftool: allow skipping file by typing 'n' at prompt
5538 completion: fix issue with process substitution not working on Git for Windows
5541 fetch: plug two leaks on error exit in store_updated_refs
5542 submodule: whitespace fix
5543 submodule::module_clone(): silence die() message from module_name()
5545 Teemu Matilainen (3):
5546 completion: unite --reuse-message and --reedit-message handling
5547 completion: commit --fixup and --squash
5548 completion: push --set-upstream
5550 Zbigniew Jędrzejewski-Szmek (1):
5551 send-email: auth plain/login fix
5554 Version v1.7.7.7; changes since v1.7.7.6:
5555 -----------------------------------------
5558 imap-send: remove dead code
5560 Jonathan Nieder (1):
5561 bundle: remove stray single-quote from error message
5568 Document the --histogram diff option
5571 Version v1.7.7.6; changes since v1.7.7.5:
5572 -----------------------------------------
5574 Clemens Buchacher (1):
5575 Documentation: read-tree --prefix works with existing subtrees
5578 Add MYMETA.json to perl/.gitignore
5581 attr: don't confuse prefixes with leading directories
5582 attr: drop misguided defensive coding
5583 attr: fix leak in free_attr_elem
5584 thin-pack: try harder to use preferred base objects as base
5587 docs: describe behavior of relative submodule URLs
5590 attr.c: make bootstrap_attr_stack() leave early
5591 attr.c: clarify the logic to pop attr_stack
5592 Documentation: rerere's rr-cache auto-creation and rerere.enabled
5595 Update draft release notes to 1.7.6.6
5596 Update draft release notes to 1.7.7.6
5599 Nguyễn Thái Ngọc Duy (2):
5600 t2203: fix wrong commit command
5601 diff-index: enable recursive pathspec matching in unpack_trees
5604 Documentation: rerere.enabled is the primary way to configure rerere
5607 Version v1.7.7.5; changes since v1.7.7.4:
5608 -----------------------------------------
5611 mingw: give waitpid the correct signature
5614 stripspace: fix outdated comment
5615 fetch: create status table using strbuf
5616 blame: don't overflow time buffer
5622 Martin von Zweigbergk (1):
5623 am: don't persist keepcr flag
5625 Michael Haggerty (1):
5626 git symbolic-ref: documentation fix
5628 Nguyễn Thái Ngọc Duy (1):
5629 checkout,merge: loosen overwriting untracked file check based on info/exclude
5632 Add MYMETA.yml to perl/.gitignore
5634 Thomas Hochstein (1):
5635 documentation fix: git difftool uses diff tools, not merge tools.
5637 Ævar Arnfjörð Bjarmason (2):
5638 apply: get rid of useless x < 0 comparison on a size_t type
5639 cast variable in call to free() in builtin/diff.c and submodule.c
5642 Version v1.7.7.4; changes since v1.7.7.3:
5643 -----------------------------------------
5645 Jonathan Nieder (2):
5646 notes merge: eliminate OUTPUT macro
5647 Makefile: add missing header file dependencies
5650 name-rev --all: do not even attempt to describe non-commit object
5653 Marc-André Lureau (1):
5654 mailmap: xcalloc mailmap_info
5657 Version v1.7.7.3; changes since v1.7.7.2:
5658 -----------------------------------------
5661 pack-objects: mark add_to_write_order() as inline
5662 pack-objects: use unsigned int for counter and offset values
5663 pack-objects: rewrite add_descendants_to_write_order() iteratively
5664 pack-objects: don't traverse objects unnecessarily
5667 docs: don't mention --quiet or --exit-code in git-log(1)
5669 Julien Muchembled (1):
5670 gitweb: fix regression when filtering out forks
5673 branch -m/-M: remove undocumented RENAMED-REF
5674 docs: Update install-doc-quick
5678 Version v1.7.7.2; changes since v1.7.7.1:
5679 -----------------------------------------
5682 attr.c: avoid inappropriate access to strbuf "buf" member
5683 cleanup: use internal memory allocation wrapper functions everywhere
5684 builtin/mv.c: plug miniscule memory leak
5685 attr.c: respect core.ignorecase when matching attribute patterns
5687 Carlos Martín Nieto (6):
5688 Remove 'working copy' from the documentation and C code
5689 fetch: free all the additional refspecs
5690 t5510: add tests for fetch --prune
5691 remote: separate out the remote_find_tracking logic into query_refspecs
5692 fetch: honor the user-provided refspecs when pruning refs
5693 fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
5695 Christian Couder (1):
5696 bisect: fix exiting when checkout failed in bisect_start()
5699 date.c: Support iso8601 timezone formats
5702 gitweb: Strip non-printable characters from syntax highlighter output
5705 add sha1_array API docs
5706 quote.h: fix bogus comment
5707 refactor argv_array into generic code
5708 quote: provide sq_dequote_to_argv_array
5709 bisect: use argv_array API
5710 checkout: use argv_array API
5711 run_hook: use argv_array API
5712 pull,rebase: handle GIT_WORK_TREE better
5715 make the sample pre-commit hook script reject names with newlines, too
5717 Jonathan Nieder (2):
5718 http: remove extra newline in error message
5719 http: avoid empty error messages for some curl errors
5722 mergetool: Use args as pathspec to unmerged files
5725 refactor run_receive_hook()
5726 diff: teach --stat/--numstat to honor -U$num
5727 mergetool: no longer need to save standard input
5728 attr: read core.attributesfile from git_default_core_config
5731 Martin von Zweigbergk (4):
5732 remote: write correct fetch spec when renaming remote 'remote'
5733 remote: "rename o foo" should not rename ref "origin/bar"
5734 remote rename: warn when refspec was not updated
5735 remote: only update remote-tracking branch if updating refspec
5738 send-email: Honour SMTP domain when using TLS
5740 Michael Haggerty (1):
5741 notes_merge_commit(): do not pass temporary buffer to other function
5743 Michael J Gruber (3):
5744 unpack-trees: print "Aborting" to stderr
5745 git-read-tree.txt: language and typography fixes
5746 git-read-tree.txt: correct sparse-checkout and skip-worktree description
5748 Nguyễn Thái Ngọc Duy (2):
5749 git-read-tree.txt: update sparse checkout examples
5750 Reindent closing bracket using tab instead of spaces
5753 t7511: avoid use of reserved filename on Windows.
5756 gitweb: Fix links to lines in blobs when javascript-actions are enabled
5758 Ramsay Allan Jones (1):
5759 t9159-*.sh: skip for mergeinfo test for svn <= 1.4
5762 read-cache.c: fix index memory allocation
5764 Richard Hartmann (1):
5765 clone: Quote user supplied path in a single quote pair
5767 Shawn O. Pearce (1):
5768 remote-curl: Fix warning after HTTP failure
5771 Documentation/git-update-index: refer to 'ls-files'
5774 Documentation: basic configuration of notes.rewriteRef
5777 Version v1.7.7.1; changes since v1.7.7:
5778 ---------------------------------------
5781 rev-list: Demonstrate breakage with --ancestry-path --all
5784 strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()
5786 Ilari Liusvaara (1):
5787 Support ERR in remote archive like in fetch/push
5790 merge-one-file: fix "expr: non-numeric argument"
5793 fetch: avoid quadratic loop checking for updated submodules
5794 filter-branch: use require_clean_work_tree
5797 fix "git apply --index ..." not to deref NULL
5799 Jonathan Nieder (2):
5800 Makefile: do not set setgid bit on directories on GNU/kFreeBSD
5801 RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting
5803 Junio C Hamano (14):
5804 revision: keep track of the end-user input from the command line
5805 revision: do not include sibling history in --ancestry-path output
5806 rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree
5807 traverse_trees(): allow pruning with pathspec
5808 unpack-trees: allow pruning with pathspec
5809 diff-index: pass pathspec down to unpack-trees machinery
5810 fsck: do not abort upon finding an empty blob
5811 Teach progress eye-candy to fetch_refs_from_bundle()
5812 apply --whitespace=error: correctly report new blank lines at end
5813 checkout $tree $path: do not clobber local changes in $path not in $tree
5814 diff: resurrect XDF_NEED_MINIMAL with --minimal
5816 Almost ready for 1.7.7.1
5820 rebase -i: clean error message for --continue after failed exec
5821 config: display key_delim for config --bool --get-regexp
5823 Michael Schubert (1):
5824 patch-id.c: use strbuf instead of a fixed buffer
5826 Nguyễn Thái Ngọc Duy (4):
5827 merge: keep stash[] a local variable
5828 merge: use return value of resolve_ref() to determine if HEAD is invalid
5829 merge: remove global variable head[]
5830 Accept tags in HEAD or MERGE_HEAD
5832 Nicolas Morey-Chaisemartin (1):
5833 grep: Fix race condition in delta_base_cache
5836 Revert removal of multi-match discard heuristic in 27af01
5837 t1304: fall back to $USER if $LOGNAME is not defined
5840 Symlink mergetools scriptlets into valgrind wrappers
5841 t6019: avoid refname collision on case-insensitive systems
5844 Version v1.7.7; changes since v1.7.7-rc3:
5845 -----------------------------------------
5848 contrib/hooks: adapt comment about Debian install location for contrib hooks
5849 templates/hooks--*: remove sample hooks without any functionality
5852 Documentation/gitnamespaces.txt: cater to older asciidoc
5856 Version v1.7.7-rc3; changes since v1.7.7-rc2:
5857 ---------------------------------------------
5860 describe: Refresh the index when run with --dirty
5863 git-mergetool: check return value from read
5866 t4014: clean up format.thread config after each test
5870 merge-recursive: Do not look at working tree during a virtual ancestor merge
5874 Version v1.7.7-rc2; changes since v1.7.7-rc1:
5875 ---------------------------------------------
5878 git-svn: teach git-svn to populate svn:mergeinfo
5880 Frédéric Heitzmann (1):
5881 Disambiguate duplicate t9160* tests
5884 branch --set-upstream: regression fix
5888 format-patch: ignore ui.color
5891 Version v1.7.7-rc1; changes since v1.7.7-rc0:
5892 ---------------------------------------------
5895 Documentation: Grammar correction, wording fixes and cleanup
5896 Mark http-fetch without -a as deprecated
5899 t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh
5901 Brian Gernhardt (1):
5902 t5540-http-test: shorten grep pattern
5905 git-svn: Teach dcommit --mergeinfo to handle multiple lines
5908 Prevent force-updating of the current branch
5909 Show interpreted branch name in error messages
5911 Dmitry Ivankov (11):
5912 fast-import: add input format tests
5913 fast-import: don't fail on omitted committer name
5914 fast-import: check committer name more strictly
5915 fsck: add a few committer name tests
5916 fsck: improve committer/author check
5917 fast-import: add a test for tree delta base corruption
5918 fast-import: prevent producing bad delta
5919 fast-import: count and report # of calls to diff_delta in stats
5920 fast-import: treat cat-blob as a delta base hint for next blob
5921 fast-import: add tests for tagging blobs
5922 fast-import: allow to tag newly created objects
5925 t6042: Add a testcase where git deletes an untracked file
5926 t6042: Add failing testcase for rename/modify/add-source conflict
5927 t6042: Add a pair of cases where undetected renames cause issues
5928 t6042: Add a testcase where undetected rename causes silent file deletion
5929 t6042: Add tests for content issues with modify/rename/directory conflicts
5930 t6042: Ensure rename/rename conflicts leave index and workdir in sane state
5931 t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
5932 t6036: Add differently resolved modify/delete conflict in criss-cross test
5933 t6036: criss-cross with weird content can fool git into clean merge
5934 t6036: tests for criss-cross merges with various directory/file conflicts
5935 t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
5936 t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
5937 t6022: Remove unnecessary untracked files to make test cleaner
5938 t6022: New tests checking for unnecessary updates of files
5939 t6022: Add testcase for merging a renamed file with a simple change
5940 merge-recursive: Make BUG message more legible by adding a newline
5941 merge-recursive: Correct a comment
5942 merge-recursive: Mark some diff_filespec struct arguments const
5943 merge-recursive: Consolidate different update_stages functions
5944 merge-recursive: Remember to free generated unique path names
5945 merge-recursive: Avoid working directory changes during recursive case
5946 merge-recursive: Fix recursive case with D/F conflict via add/add conflict
5947 merge-recursive: Fix sorting order and directory change assumptions
5948 merge-recursive: Fix code checking for D/F conflicts still being present
5949 merge-recursive: Save D/F conflict filenames instead of unlinking them
5950 merge-recursive: Split was_tracked() out of would_lose_untracked()
5951 merge-recursive: Allow make_room_for_path() to remove D/F entries
5952 merge-recursive: Split update_stages_and_entry; only update stages at end
5953 merge-recursive: Fix deletion of untracked file in rename/delete conflicts
5954 merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
5955 merge-recursive: Add comments about handling rename/add-source cases
5956 merge-recursive: Improve handling of rename target vs. directory addition
5957 merge-recursive: Consolidate process_entry() and process_df_entry()
5958 merge-recursive: Cleanup and consolidation of rename_conflict_info
5959 merge-recursive: Provide more info in conflict markers with file renames
5960 merge-recursive: When we detect we can skip an update, actually skip it
5961 merge-recursive: Fix modify/delete resolution in the recursive case
5962 merge-recursive: Introduce a merge_file convenience function
5963 merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
5964 merge-recursive: Small cleanups for conflict_rename_rename_1to2
5965 merge-recursive: Defer rename/rename(2to1) handling until process_entry
5966 merge-recursive: Record more data needed for merging with dual renames
5967 merge-recursive: Create function for merging with branchname:file markers
5968 merge-recursive: Consider modifications in rename/rename(2to1) conflicts
5969 merge-recursive: Make modify/delete handling code reusable
5970 merge-recursive: Have conflict_rename_delete reuse modify/delete code
5971 merge-recursive: add handling for rename/rename/add-dest/add-dest
5972 merge-recursive: Fix working copy handling for rename/rename/add/add
5973 t6022: Add testcase for spurious "refusing to lose untracked" messages
5974 merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
5975 t6022: Additional tests checking for unnecessary updates of files
5976 merge-recursive: Avoid unnecessary file rewrites
5977 t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
5978 merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
5979 merge-recursive: Don't re-sort a list whose order we depend upon
5982 git-svn: fix fetch with moved path when using rewriteRoot
5984 Fredrik Gustafsson (1):
5985 push: Don't push a repository with unpushed submodules
5987 Fredrik Kuivinen (6):
5988 Add obstack.[ch] from EGLIBC 2.10
5989 Add string search routines from GNU grep
5990 Adapt the kwset code to Git
5991 Use kwset in pickaxe
5993 obstack: Fix portability issues
5995 Giuseppe Bilotta (2):
5996 am: format is in $patch_format, not parse_patch
5997 am: fix stgit patch mangling
6000 t3030: fix accidental success in symlink rename
6001 t7006: modernize calls to unset
6002 test-lib: add helper functions for config
6003 t7006: use test_config helpers
6004 setup_pager: set GIT_PAGER_IN_USE
6005 diff: refactor COLOR_DIFF from a flag into an int
6006 git_config_colorbool: refactor stdout_is_tty handling
6007 color: delay auto-color decision until point of use
6008 config: refactor get_colorbool function
6009 diff: don't load color config in plumbing
6010 want_color: automatically fallback to color.ui
6011 support pager.* for external commands
6014 fetch: skip on-demand checking when no submodules are configured
6017 string-list: Add API to remove an item from an unsorted list
6018 t3005: do not assume a particular order of stdout and stderr of git-ls-files
6021 bisect: take advantage of gettextln, eval_gettextln.
6023 Jonathan Nieder (1):
6024 Documentation/remote-helpers: explain capabilities first
6026 Junio C Hamano (14):
6027 combine-diff: support format_callback
6028 read_gitfile_gently(): rename misnamed function to read_gitfile()
6029 clone: allow more than one --reference
6030 clone: clone from a repository with relative alternates
6031 Update draft release notes to 1.7.7
6032 Documentation: clarify "git clean -e <pattern>"
6033 Update draft release notes to 1.7.7
6034 Revert "Merge branch 'cb/maint-quiet-push' into maint"
6036 Update draft release notes to 1.7.7
6037 Minor update to how-to maintain git
6038 Prepare for 1.7.6.3 maintenance release
6043 Documentation/git-remote-helpers: explain how import works with multiple refs
6044 (short) documentation for the testgit remote helper
6046 Michael Haggerty (9):
6048 Document struct match_attr
6049 Increment num_attr in parse_attr_line(), not parse_attr()
6050 Change parse_attr() to take a pointer to struct attr_state
6051 Determine the start of the states outside of the pass loop
6052 Change while loop into for loop
6053 Unroll the loop over passes
6054 check-ref-format --print: Normalize refnames that start with slashes
6055 Forbid DEL characters in reference names
6057 Michael J Gruber (3):
6058 git-notes.txt: clarify -C vs. copy and -F
6059 log: Do not decorate replacements with --no-replace-objects
6060 RelNotes/1.7.7: minor fixes
6062 Michael Stapelberg (1):
6063 git-daemon.txt: specify --timeout in seconds
6066 branch -v: honor core.abbrev
6068 Nguyễn Thái Ngọc Duy (6):
6069 decoration: do not mis-decorate refs with same prefix
6070 Add for_each_commit_graft() to iterate all grafts
6071 Move write_shallow_commits to fetch-pack.c
6072 log: decorate grafted commits with "grafted"
6073 log: decorate "replaced" on to replaced commits
6074 clone: allow to clone from .git file
6077 git-p4: simple branch tests edits
6080 git-svn: New flag to emulate empty directories
6082 Sverre Rabbelier (1):
6083 SubmittingPathces: remove Cogito reference
6086 xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
6087 xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()
6090 Use memmove in ident_to_git
6091 t4014: check for empty files from git format-patch --stdout
6092 t4014: invoke format-patch with --stdout where intended
6093 t4014: "no-add-headers" is actually called "no-add-header"
6094 Document negated forms of format-patch --to --cc --add-headers
6095 strbuf_grow(): maintain nul-termination even for new buffer
6096 Documentation: clarify effects of -- <path> arguments
6097 t3903: fix misquoted rev-parse invocation
6100 git-p4: Allow setting rename/copy detection threshold
6101 git-p4: Add description of rename/copy detection options
6102 git-p4: Add test case for rename detection
6103 git-p4: Add test case for copy detection
6104 git-p4: Process detectCopiesHarder with --bool
6105 git-p4: Correct branch base depot path detection
6106 git-p4: Allow filtering Perforce branches by user
6107 git-p4: Allow branch definition with git config
6108 git-p4: Add simple test case for branch import
6111 Version v1.7.7-rc0; changes since v1.7.6.5:
6112 -------------------------------------------
6115 describe: Refresh the index when run with --dirty
6118 Add profile feedback build to git
6119 Add explanation of the profile feedback build to the README
6121 Clemens Buchacher (1):
6122 commit: allow partial commits with relative paths
6125 setup: Provide GIT_PREFIX to built-ins
6126 git: Remove handling for GIT_PREFIX
6127 git-mergetool--lib: Make vimdiff retain the current directory
6128 t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests
6129 difftool--helper: Make style consistent with git
6130 mergetool--lib: Make style consistent with git
6131 mergetool--lib: Refactor tools into separate files
6132 mergetools/meld: Use '--output' when available
6135 am: ignore leading whitespace before patch
6138 stash: Add --include-untracked option to stash and remove all untracked files
6141 remote-helpers: export GIT_DIR variable to helpers
6142 parse-options: export opterr, optbug
6143 Reduce parse-options.o dependencies
6144 doc/fast-import: document feature import-marks-if-exists
6147 http: pass http.cookiefile using CURLOPT_COOKIEFILE
6150 verify_path: consider dos drive prefix
6151 connect: only log if all attempts failed (ipv4)
6153 Fredrik Gustafsson (2):
6154 git-sh-setup: add die_with_status
6155 submodule update: continue when a checkout fails
6157 Jakub Narębski (14):
6158 gitweb.js: No need for inProgress in blame_incremental.js
6159 gitweb.js: No need for loop in blame_incremental's handleResponse()
6160 gitweb.js: use setTimeout rather than setInterval in blame_incremental.js
6161 gitweb: Check permissions first in git_search
6162 gitweb: Split body of git_search into subroutines
6163 gitweb: Clean up code in git_search_* subroutines
6164 gitweb: Make git_search_* subroutines render whole pages
6165 gitweb: Refactor git_header_html
6166 git-instaweb: Extract configuring web server into configure_httpd
6167 git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf
6168 git-instaweb: Move all actions at the end of script
6169 git-instaweb: Check that correct config file exists for (re)start
6170 gitweb: Introduce common system-wide settings for convenience
6171 gitweb: Git config keys are case insensitive, make config search too
6174 t: add tests for cloning remotes with detached HEAD
6175 consider only branches in guess_remote_head
6176 make copy_ref globally available
6177 clone: always fetch remote HEAD
6178 limit "contains" traversals based on commit timestamp
6179 default core.clockskew variable to one day
6180 archive: reorder option parsing and config reading
6181 archive-tar: don't reload default config options
6182 archive: refactor list of archive formats
6183 archive: pass archiver struct to write_archive callback
6184 archive: move file extension format-guessing lower
6185 archive: refactor file extension format-guessing
6186 archive: implement configurable tar filters
6187 archive: provide builtin .tar.gz filter
6188 upload-archive: allow user to turn off filters
6189 parse-options: add OPT_STRING_LIST helper
6190 remote: use new OPT_STRING_LIST
6191 config: make git_config_parse_parameter a public function
6192 clone: accept config options on the command line
6193 git skew: a tool to find how big a clock skew exists in the history
6194 transport-helper: fix minor leak in push_refs_with_export
6195 t5800: factor out some ref tests
6196 t5800: document some non-functional parts of remote helpers
6197 git-remote-testgit: import non-HEAD refs
6198 transport-helper: don't feed bogus refs to export push
6199 git_remote_helpers: push all refs during a non-local export
6200 streaming: free git_istream upon closing
6201 docs: put listed example commands in backticks
6204 Documentation/submodule: add command references and update options
6207 sha1_file: use the correct type (ssize_t, not size_t) for read-style function
6210 sh-i18n--envsubst: do not crash when no arguments are given
6211 mingw.c: move definition of mingw_getenv down
6212 Windows: teach getenv to do a case-sensitive search
6213 rebase: do not print lots of usage hints after an obvious error message
6214 Make test number unique
6215 Skip archive --remote tests on Windows
6216 t3900: do not reference numbered arguments from the test script
6219 Add option hooks.diffopts to customize change summary in post-receive-email
6222 bisect: move argument parsing before state modification.
6223 bisect: use && to connect statements that are deferred with eval.
6224 bisect: add tests to document expected behaviour in presence of broken trees.
6225 bisect: introduce support for --no-checkout option.
6226 bisect: introduce --no-checkout support into porcelain.
6227 bisect: add tests for the --no-checkout option.
6228 bisect: add documentation for --no-checkout option.
6229 bisect: cleanup whitespace errors in git-bisect.sh.
6230 bisect: replace "; then" with "\n<tab>*then"
6231 misc-sh: fix up whitespace in some other .sh files.
6232 gettext: add gettextln, eval_gettextln to encode common idiom
6233 git-am: take advantage of gettextln and eval_gettextln.
6234 pull: take advantage of eval_gettextln
6235 stash: take advantage of eval_gettextln
6236 submodule: take advantage of gettextln and eval_gettextln.
6237 bisect: add support for bisecting bare repositories
6239 Jonathan Nieder (4):
6240 test: simplify return value of test_run_
6241 test: cope better with use of return for errors
6242 revert: plug memory leak in "cherry-pick root commit" codepath
6243 merge-recursive: take advantage of hardcoded empty tree
6246 Fix prefix handling in ref iteration functions
6247 ref namespaces: infrastructure
6248 ref namespaces: Support remote repositories via upload-pack and receive-pack
6249 ref namespaces: documentation
6250 ref namespaces: tests
6252 Junio C Hamano (52):
6253 index-pack: group the delta-base array entries also by type
6254 write_idx_file: introduce a struct to hold idx customization options
6255 index-pack: --verify
6256 write_idx_file: need_large_offset() helper function
6257 index-pack --verify: read anomalous offsets from v2 idx file
6258 packed_object_info_detail(): do not return a string
6259 sha1_object_info_extended(): expose a bit more info
6260 sha1_object_info_extended(): hint about objects in delta-base cache
6261 unpack_object_header(): make it public
6262 write_entry(): separate two helper functions out
6263 streaming: a new API to read from the object store
6264 streaming_write_entry(): use streaming API in write_entry()
6265 convert: CRLF_INPUT is a no-op in the output codepath
6266 streaming_write_entry(): support files with holes
6267 streaming: read non-delta incrementally from a pack
6268 sha1_file.c: expose helpers to read loose objects
6269 streaming: read loose objects incrementally
6270 checkout: make advice when reattaching the HEAD less loud
6271 merge: reword the final message
6272 convert.h: move declarations for conversion from cache.h
6273 Add streaming filter API
6274 stream filter: add "no more input" to the filters
6275 Add LF-to-CRLF streaming conversion
6276 streaming filter: ident filter
6277 streaming: filter cascading
6278 t0021: test application of both crlf and ident
6279 diff --stat-count: finishing touches
6280 index-pack: a miniscule refactor
6281 index-pack: start learning to emulate "verify-pack -v"
6282 index-pack: show histogram when emulating "verify-pack -v"
6283 verify-pack: use index-pack --verify
6284 verify_path(): simplify check at the directory boundary
6285 git-submodule.sh: clarify the "should we die now" logic
6286 Add option to disable NORETURN
6288 core: log offset pack data accesses happened
6289 pack-objects: optimize "recency order"
6290 diff-lib: simplify do_diff_cache()
6291 diff-lib: refactor run_diff_index() and do_diff_cache()
6292 Revert clock-skew based attempt to optimize tag --contains traversal
6293 Update draft release notes to 1.7.7
6294 Update draft release notes to 1.7.7
6295 bisect: further style nitpicks
6296 filter-branch.sh: de-dent usage string
6297 Update draft release notes to 1.7.7
6298 test: consolidate definition of $LF
6300 Update draft release notes to 1.7.7
6301 Update draft release notes to 1.7.7
6302 commit: reduce use of redundant global variables
6303 Update draft release notes to 1.7.7
6307 gitweb: allow space as delimiter in mime.types
6310 Update the Interix default build configuration.
6312 Michael Haggerty (29):
6313 doc: Add a link from gitattributes(5) to git-check-attr(1)
6314 doc: Correct git_attr() calls in example code
6315 Remove anachronism from comment
6316 Disallow the empty string as an attribute name
6317 git-check-attr: Add missing "&&"
6318 git-check-attr: Add tests of command-line parsing
6319 Provide access to the name attribute of git_attr
6320 git-check-attr: Use git_attr_name()
6321 Teach prepare_attr_stack() to figure out dirlen itself
6322 Extract a function collect_all_attrs()
6323 Remove redundant call to bootstrap_attr_stack()
6324 Remove redundant check
6325 Allow querying all attributes on a file
6326 git-check-attr: Extract a function output_attr()
6327 git-check-attr: Introduce a new variable
6328 git-check-attr: Extract a function error_with_usage()
6329 git-check-attr: Handle each error separately
6330 git-check-attr: Process command-line args more systematically
6331 git-check-attr: Error out if no pathnames are specified
6332 git-check-attr: Add an --all option to show all attributes
6333 git-check-attr: Drive two tests using the same raw data
6334 git-check-attr: Fix command-line handling to match docs
6335 Rename git_checkattr() to git_check_attr()
6336 git-check-attr: test that no output is written to stderr
6337 git-check-attr: Demonstrate problems with unnormalized paths
6338 git-check-attr: Demonstrate problems with relative paths
6339 git-check-attr: Normalize paths
6340 test-path-utils: Add subcommand "absolute_path"
6341 test-path-utils: Add subcommand "prefix_path"
6343 Michael J Gruber (3):
6344 diff.c: omit hidden entries from namelen calculation with --stat
6345 diff: introduce --stat-lines to limit the stat lines
6346 diff-options.txt: describe --stat-{width,name-width,count}
6349 git-p4: use test_when_finished in tests
6350 git-p4: add missing && in test
6351 git-p4: one test missing config git-p4.skipSubmitEditCheck
6352 git-p4: commit time should be most recent p4 change time
6354 Ramsay Allan Jones (3):
6355 help.c: Fix detection of custom merge strategy on cygwin
6356 t1301-*.sh: Fix the 'forced modes' test on cygwin
6357 config.c: Make git_config() work correctly when called recursively
6360 t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
6361 grep: fix coloring of hunk marks between files
6364 grep: add option to show whole function as context
6365 grep: long context options
6368 Tolerate zlib deflation with window size < 32Kb
6370 Sverre Rabbelier (14):
6371 t5800: use skip_all instead of prereq
6372 remote-curl: accept empty line as terminator
6373 git-remote-testgit: only push for non-local repositories
6374 git-remote-testgit: fix error handling
6375 fast-import: introduce 'done' command
6376 fast-export: support done feature
6377 transport-helper: factor out push_update_refs_status
6378 transport-helper: check status code of finish_command
6379 transport-helper: use the new done feature where possible
6380 transport-helper: update ref status after push with export
6381 transport-helper: change import semantics
6382 transport-helper: Use capname for refspec capability too
6383 transport-helper: implement marks location as capability
6384 transport-helper: die early on encountering deleted refs
6387 xdiff/xprepare: use memset()
6388 xdiff/xprepare: refactor abort cleanups
6389 xdiff/xpatience: factor out fall-back-diff function
6390 t4033-diff-patience: factor out tests
6391 teach --histogram to diff
6392 xdiff/xprepare: skip classification
6393 xdiff/xprepare: use a smaller sample size for histogram diff
6394 xdiff: do away with xdl_mmfile_next()
6395 http.c: fix an invalid free()
6396 Makefile: some changes for http-related flag documentation
6397 xdiff/xhistogram: rework handling of recursed results
6398 xdiff/xhistogram: rely on xdl_trim_ends()
6399 xdiff/xhistogram: drop need for additional variable
6402 A Windows path starting with a backslash is absolute
6403 real_path: do not assume '/' is the path seperator
6404 verify_dotfile(): do not assume '/' is the path seperator
6407 Makefile: add Minix configuration options.
6409 maximilian attems (2):
6410 am: pass exclude down to apply
6411 am: Document new --exclude=<path> option
6413 Ævar Arnfjörð Bjarmason (48):
6414 i18n: git-am add git-sh-i18n
6415 i18n: git-am one-line gettext $msg; echo
6416 i18n: git-am multi-line getttext $msg; echo
6417 i18n: git-am eval_gettext messages
6418 i18n: git-am gettext + gettext to stderr message
6419 i18n: git-am die messages
6420 i18n: git-am cannot_fallback messages
6421 i18n: git-am clean_abort messages
6422 i18n: git-am "Apply?" message
6423 i18n: git-am "Falling back" say message
6424 i18n: git-am core say messages
6425 i18n: git-am printf(1) message to eval_gettext
6426 i18n: git-pull add git-sh-i18n
6427 i18n: git-pull die messages
6428 i18n: git-pull eval_gettext + die message
6429 i18n: git-pull eval_gettext + warning message
6430 i18n: git-submodule add git-sh-i18n
6431 i18n: git-submodule echo + eval_gettext messages
6432 i18n: git-submodule say + eval_gettext messages
6433 i18n: git-submodule die + eval_gettext messages
6434 i18n: git-submodule $update_module say + die messages
6435 i18n: git-submodule "cached cannot be used" message
6436 i18n: git-submodule "Submodule change[...]" messages
6437 i18n: git-submodule $errmsg messages
6438 i18n: git-submodule "Entering [...]" message
6439 i18n: git-submodule "[...] path is ignored" message
6440 i18n: git-submodule "path not initialized" message
6441 i18n: git-submodule "blob" and "submodule" messages
6442 i18n: git-stash add git-sh-i18n
6443 i18n: git-stash echo + gettext message
6444 i18n: git-stash say + gettext messages
6445 i18n: git-stash die + gettext messages
6446 i18n: git-stash die + eval_gettext messages
6447 i18n: git-stash die + eval_gettext $* messages
6448 i18n: git-stash die + eval_gettext $1 messages
6449 i18n: git-stash "unknown option" message
6450 i18n: git-stash drop_stash say/die messages
6451 i18n: git-bisect add git-sh-i18n
6452 i18n: git-bisect gettext + echo message
6453 i18n: git-bisect echo + gettext messages
6454 i18n: git-bisect echo + eval_gettext message
6455 i18n: git-bisect die + gettext messages
6456 i18n: git-bisect die + eval_gettext messages
6457 i18n: git-bisect bisect_run + $@ messages
6458 i18n: git-bisect bisect_reset + $1 messages
6459 i18n: git-bisect bisect_replay + $1 messages
6460 i18n: git-bisect [Y/n] messages
6461 i18n: git-bisect bisect_next_check "You need to" message
6464 gitweb: pass string after encoding in utf-8 to syntax highlighter
6467 Version v1.7.6.5; changes since v1.7.6.4:
6468 -----------------------------------------
6471 date.c: Support iso8601 timezone formats
6474 stripspace: fix outdated comment
6475 fetch: create status table using strbuf
6476 blame: don't overflow time buffer
6479 make the sample pre-commit hook script reject names with newlines, too
6482 mergetool: Use args as pathspec to unmerged files
6485 mergetool: no longer need to save standard input
6486 name-rev --all: do not even attempt to describe non-commit object
6489 Marc-André Lureau (1):
6490 mailmap: xcalloc mailmap_info
6492 Martin von Zweigbergk (4):
6493 remote: write correct fetch spec when renaming remote 'remote'
6494 remote: "rename o foo" should not rename ref "origin/bar"
6495 remote rename: warn when refspec was not updated
6496 remote: only update remote-tracking branch if updating refspec
6498 Michael Haggerty (1):
6499 notes_merge_commit(): do not pass temporary buffer to other function
6501 Michael J Gruber (3):
6502 unpack-trees: print "Aborting" to stderr
6503 git-read-tree.txt: language and typography fixes
6504 git-read-tree.txt: correct sparse-checkout and skip-worktree description
6506 Nguyễn Thái Ngọc Duy (2):
6507 git-read-tree.txt: update sparse checkout examples
6508 Reindent closing bracket using tab instead of spaces
6511 gitweb: Fix links to lines in blobs when javascript-actions are enabled
6513 Ramsay Allan Jones (1):
6514 t9159-*.sh: skip for mergeinfo test for svn <= 1.4
6517 Add MYMETA.yml to perl/.gitignore
6520 Documentation/git-update-index: refer to 'ls-files'
6523 Documentation: basic configuration of notes.rewriteRef
6526 Version v1.7.6.4; changes since v1.7.6.3:
6527 -----------------------------------------
6530 describe: Refresh the index when run with --dirty
6532 Clemens Buchacher (1):
6533 ls-files: fix pathspec display on error
6535 Giuseppe Bilotta (1):
6536 am: format is in $patch_format, not parse_patch
6539 git-mergetool: check return value from read
6542 t3005: do not assume a particular order of stdout and stderr of git-ls-files
6545 read_gitfile_gently(): rename misnamed function to read_gitfile()
6546 clone: allow more than one --reference
6547 clone: clone from a repository with relative alternates
6550 Michael Haggerty (2):
6551 check-ref-format --print: Normalize refnames that start with slashes
6552 Forbid DEL characters in reference names
6554 Michael J Gruber (1):
6555 branch.c: use the parsed branch name
6557 Nguyễn Thái Ngọc Duy (1):
6558 clone: allow to clone from .git file
6561 Version v1.7.6.3; changes since v1.7.6.2:
6562 -----------------------------------------
6565 Do not log unless all connect() attempts fail
6568 status: fix bug with missing --ignore files
6569 tag: speed up --contains calculation
6570 strbuf_split: add a max parameter
6571 fix "git -c" parsing of values with equals signs
6572 config: die on error in command-line config
6573 config: avoid segfault when parsing command-line config
6574 strbuf: allow strbuf_split to work on non-strbufs
6575 config: use strbuf_split_str instead of a temporary strbuf
6576 reset: give better reflog messages
6579 fetch: skip on-demand checking when no submodules are configured
6581 Jonathan Nieder (2):
6582 Documentation: quote double-dash for AsciiDoc
6583 Documentation/i18n: quote double-dash for AsciiDoc
6586 git status --ignored: tests and docs
6587 mergetool: check return value from read
6588 Prepare for 1.7.6.3 maintenance release
6591 Michael Schubert (1):
6592 reflog: actually default to subcommand 'show'
6594 Sverre Rabbelier (1):
6595 SubmittingPathces: remove Cogito reference
6598 tests: cleanup binary test vector files
6601 Version v1.7.6.2; changes since v1.7.6.1:
6602 -----------------------------------------
6605 whitespace: have SP on both sides of an assignment "="
6606 Revert "Merge branch 'cb/maint-quiet-push' into maint"
6610 update-ref: whitespace fix
6613 Documentation: clarify effects of -- <path> arguments
6616 Version v1.7.6.1; changes since v1.7.6:
6617 ---------------------------------------
6620 Fix documentation of fetch-pack that implies that the client can disconnect after sending wants.
6621 Document the underlying protocol used by shallow repositories and --depth commands.
6624 rebase -i -p: include non-first-parent commits in todo list
6627 Documentation: clearly specify what refs are honored by core.logAllRefUpdates
6630 t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin
6631 git-submodule.sh: preserve stdin for the command spawned by foreach
6634 get_indexed_object can return NULL if nothing is in that slot; check for it
6636 Carlos Martín Nieto (1):
6637 Documentation: clarify the invalidated tree entry format
6639 Clemens Buchacher (3):
6640 error_routine: use parent's stderr if exec fails
6641 propagate --quiet to send-pack/receive-pack
6642 notice error exit from pager
6645 doc/fast-import: clarify notemodify command
6648 Documentation: ignore *.pdf files
6649 Documentation/Makefile: add *.pdf to `clean' target
6652 connect: correctly number ipv6 network adapter
6654 Fredrik Kuivinen (1):
6655 Makefile: Track changes to LDFLAGS and relink when necessary
6658 add gitignore entry to description about how to write a builtin
6659 add technical documentation about ref iteration
6662 Documentation: minor grammatical fix in rev-list-options.txt
6665 gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
6666 gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
6669 combine-diff: split header printing into its own function
6670 combine-diff: calculate mode_differs earlier
6671 combine-diff: handle binary files as binary
6672 refactor get_textconv to not require diff_filespec
6673 combine-diff: respect textconv attributes
6674 tag: accept multiple patterns for --list
6675 docs: document --textconv diff option
6676 t7400: fix bogus test failure with symlinked trash
6677 fast-export: quote paths in output
6678 am: refresh the index at start and --resolved
6681 submodule add: test failure when url is not configured in superproject
6682 submodule add: allow relative repository path even when no url is set
6683 submodule add: clean up duplicated code
6684 fetch: Also fetch submodules in subdirectories in on-demand mode
6685 submodule add: always initialize .git/config entry
6686 tests: print failed test numbers at the end of the test run
6687 submodule: update and add must honor --quiet flag
6689 Johannes Schindelin (1):
6690 get_pwd_cwd(): Do not trust st_dev/st_ino blindly
6693 Add a test to check that git ls-tree sets non-zero exit code on error.
6694 Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
6696 Julian Phillips (1):
6697 remote-curl: Add a format check to parsing of info/refs
6699 Junio C Hamano (29):
6700 diff-index --quiet: learn the "stop feeding the backend early" logic
6701 checkout -b <name>: correctly detect existing branch
6702 sha1_file.c: "legacy" is really the current format
6703 zlib wrapper: refactor error message formatter
6704 zlib: wrap remaining calls to direct inflate/inflateEnd
6705 zlib: wrap inflateInit2 used to accept only for gzip format
6706 zlib: wrap deflate side of the API
6707 zlib: wrap deflateBound() too
6708 zlib: zlib can only process 4GB at a time
6709 zlib: allow feeding more than 4GB in one go
6710 t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
6711 cygwin: trust executable bit by default
6712 git-remote.txt: avoid sounding as if loose refs are the only ones in the world
6713 check-ref-format doc: de-emphasize the implementation detail of a ref
6714 git.txt: de-emphasize the implementation detail of a ref
6715 glossary: update description of "tag"
6716 glossary: update description of head and ref
6717 glossary: clarify description of HEAD
6718 submodule sync: do not auto-vivify uninteresting submodule
6719 "branch -d" can remove more than one branches
6720 test: skip clean-up when running under --immediate mode
6721 checkout: do not write bogus reflog entry out
6722 reset [<commit>] paths...: do not mishandle unmerged paths
6723 diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
6724 receive-pack: do not overstep command line argument array
6725 helping smart-http/stateless-rpc fetch race
6727 Update draft release notes for 1.7.6.1
6730 Martin von Zweigbergk (2):
6731 Documentation: use [verse] for SYNOPSIS sections
6732 rebase: clarify "restore the original branch"
6734 Michael Haggerty (6):
6735 git-svn: Demonstrate a bug with root commits in mergeinfo ranges
6736 git-svn: Disambiguate rev-list arguments to improve error message
6737 git-svn: Correctly handle root commits in mergeinfo ranges
6738 gitattributes: Clarify discussion of attribute macros
6739 gitattributes: Reword "attribute macro" to "macro attribute"
6740 Do not use C++-style comments
6742 Michael Schubert (1):
6743 help_unknown_cmd: do not propose an "unknown" cmd
6746 filter-branch: Export variable `workdir' for --commit-filter
6749 git-remote.txt: fix wrong remote refspec
6751 Nguyễn Thái Ngọc Duy (3):
6752 Break down no-lstat() condition checks in verify_uptodate()
6753 checkout-index: remove obsolete comment
6754 fetch-pack: check for valid commit from server
6757 pull: remove extra space from reflog message
6759 Pavan Kumar Sunkara (1):
6760 git-config: Remove extra whitespaces
6762 Peter Collingbourne (1):
6763 Documentation: git-filter-branch honors replacement refs
6766 Version v1.7.6; changes since v1.7.6-rc3:
6767 -----------------------------------------
6773 completion: replace core.abbrevguard to core.abbrev
6776 Version v1.7.6-rc3; changes since v1.7.6-rc2:
6777 ---------------------------------------------
6780 builtin/gc.c: add missing newline in message
6783 sh-i18n--envsubst.c: do not #include getopt.h
6785 Christof Krüger (1):
6786 Documentation: git diff --check respects core.whitespace
6789 Fix typo: existant->existent
6792 gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
6795 t/Makefile: pass test opts to valgrind target properly
6796 tests: link shell libraries into valgrind directory
6799 plug a few coverity-spotted leaks
6802 t7810: avoid unportable use of "echo"
6806 Version v1.7.6-rc2; changes since v1.7.6-rc1:
6807 ---------------------------------------------
6809 Jonathan Nieder (1):
6810 gitweb: do not misparse nonnumeric content tag files that contain a digit
6816 Version v1.7.6-rc1; changes since v1.7.6-rc0:
6817 ---------------------------------------------
6820 t3703: skip more tests using colons in file names on Windows
6823 t7508: demonstrate status's failure to use --porcelain format with -z
6824 builtin/commit.c: set status_format _after_ option parsing
6827 gitweb: Move information about installation from README to INSTALL
6828 gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL
6829 gitweb: Move "Requirements" up in gitweb/INSTALL
6830 gitweb: Fix usability of $prevent_xss
6833 diff_tree: disable QUICK optimization with diff filter
6836 fetch: do not leak a refspec
6839 diff: futureproof "stop feeding the backend early" logic
6843 Version v1.7.6-rc0; changes since v1.7.5.4:
6844 -------------------------------------------
6847 Do not strip empty lines / trailing spaces from a commit message template
6849 Carlos Martín Nieto (1):
6850 log: convert to parse-options
6853 Use a temporary index for git commit --interactive
6854 Allow git commit --interactive with paths
6855 Add support for -p/--patch to git-commit
6856 Add commit to list of config.singlekey commands
6857 Test atomic git-commit --interactive
6860 rebase: create HEAD reflog entry when aborting
6863 Share color list between graph and show-branch
6864 http: make curl callbacks match contracts from curl header
6865 http-push: use const for strings in signatures
6866 http-push: refactor curl_easy_setup madness
6869 t6022: New test checking for unnecessary updates of renamed+modified files
6870 t6022: New test checking for unnecessary updates of files in D/F conflicts
6871 merge-recursive: When we detect we can skip an update, actually skip it
6874 strbuf: make sure buffer is zero-terminated
6875 config: support values longer than 1023 bytes
6878 test that git status works with merge conflict in, .gitmodules
6881 hashcmp(): inline memcmp() by hand to optimize
6883 Jakub Narębski (13):
6884 gitweb: Restructure projects list generation
6885 gitweb: Change the way "content tags" ('ctags') are handled
6886 gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
6887 gitweb: Split JavaScript for maintability, combining on build
6888 gitweb.js: Update and improve comments in JavaScript files
6889 gitweb.js: Provide default values for padding in padLeftStr and padLeft
6890 gitweb.js: Extract and improve datetime handling
6891 gitweb.js: Introduce code to handle cookies from JavaScript
6892 gitweb.js: Provide getElementsByClassName method (if it not exists)
6893 gitweb: Refactor generating of long dates into format_timestamp_html
6894 gitweb: Unify the way long timestamp is displayed
6895 gitweb: Make JavaScript ability to adjust timezones configurable
6896 gitweb: Refactor reading and parsing config file into read_config_file
6899 "git log -h": typofix misspelled 'suppress'
6900 Add log.abbrevCommit config variable
6903 notes: make expand_notes_ref globally accessible
6904 revision.c: refactor notes ref expansion
6905 notes: refactor display notes extra refs field
6906 notes: refactor display notes default handling
6907 revision.c: support --notes command-line option
6908 revision.c: make --no-notes reset --notes list
6909 format-patch: wrap email addresses after long names
6910 add tests for various blame formats
6911 blame: refactor porcelain output
6912 blame: add --line-porcelain output format
6913 t7501.8: feed a meaningful command
6914 fetch: avoid repeated commits in mark_complete
6915 Makefile: sort TEST_PROGRAMS list
6916 refactor refs_from_alternate_cb to allow passing extra data
6917 bisect: refactor sha1_array into a generic sha1 list
6918 receive-pack: eliminate duplicate .have refs
6919 doc: discuss textconv versus external diff drivers
6920 remote: allow "-t" with fetch mirrors
6921 read_in_full: always report errors
6922 t: test subject handling in format-patch / am pipeline
6923 mailinfo: always clean up rfc822 header folding
6924 pretty: add pp_commit_easy function for simple callers
6925 clean up calling conventions for pretty.c functions
6926 format-patch: preserve subject newlines with -k
6927 rebase: write a reflog entry when finishing
6928 format-patch: make zero-length subject prefixes prettier
6931 Submodules: Don't parse .gitmodules when it contains, merge conflicts
6932 unpack-trees: add the dry_run flag to unpack_trees_options
6933 Teach read-tree the -n|--dry-run option
6936 diffcore-rename.c: avoid set-but-not-used warning
6937 plug a DIR buffer leak in rerere.c
6940 log/pretty-options: Document --[no-]notes and deprecate old notes options
6941 Make "git notes add" more user-friendly when there are existing notes
6942 Add several testcases for --dirstat and friends
6943 Make --dirstat=0 output directories that contribute < 0.1% of changes
6944 Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file
6945 Add config variable for specifying default --dirstat behavior
6946 Allow specifying --dirstat cut-off percentage as a floating point number
6947 New --dirstat=lines mode, doing dirstat analysis based on diffstat
6948 Improve error handling when parsing dirstat parameters
6949 Mark dirstat error messages for translation
6952 t3703: Skip tests using directory name ":" on Windows
6953 Tweak t3102-ls-tree-wildcards to run on Windows
6954 Windows: add a wrapper for the shutdown() system call
6956 John 'Warthog9' Hawley (2):
6957 gitweb: JavaScript ability to adjust time based on timezone
6958 gitweb.js: Add UI for selecting common timezone to display dates
6961 git: add --info-path and --man-path options
6963 Jonathan Nieder (15):
6964 revisions: split out handle_revision_pseudo_opt function
6965 revisions: allow --glob and friends in parse_options-enabled commands
6966 Documentation: clarify meaning of --html-path, --man-path, and --info-path
6967 tests: eliminate unnecessary setup test assertions
6968 tests: teach verify_parents to check for extra parents
6969 tests: check git does not barf on merge.ff values for future versions of git
6970 completion: move private shopt shim for zsh to __git_ namespace
6971 t4018 (funcname patterns): make .gitattributes state easier to track
6972 t4018 (funcname patterns): make configuration easier to track
6973 t4018 (funcname patterns): minor cleanups
6974 userdiff/perl: anchor "sub" and "package" patterns on the left
6975 userdiff/perl: match full line of POD headers
6976 userdiff/perl: catch sub with brace on second line
6977 tests: make test_expect_code quieter on success
6978 userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters
6980 Junio C Hamano (53):
6981 merge-recursive: tweak magic band-aid
6982 git diff -D: omit the preimage of deletes
6983 pathspec: rename per-item field has_wildcard to use_wildcard
6984 magic pathspec: add tentative ":/path/from/top/level" pathspec support
6985 merge: allow "-" as a short-hand for "previous branch"
6986 magic pathspec: futureproof shorthand form
6987 magic pathspec: add ":(icase)path" to match case insensitively
6989 Update draft release notes to 1.7.6
6990 Update draft release notes to 1.7.6
6991 Update draft release notes to 1.7.6
6992 Update draft release notes to 1.7.6
6993 merge: introduce merge.ff configuration variable
6994 rerere: libify rerere_clear() and rerere_gc()
6995 index_fd(): turn write_object and format_check arguments into one flag
6996 index_fd(): split into two helper functions
6997 convert: rename the "eol" global variable to "core_eol"
6998 convert: give saner names to crlf/eol variables, types and functions
6999 convert: make it safer to add conversion attributes
7000 convert: make it harder to screw up adding a conversion attribute
7001 git-grep: do not die upon -F/-P when grep.extendedRegexp is set.
7002 Revert "magic pathspec: add ":(icase)path" to match case insensitively"
7003 pathspec: drop "lone : means no pathspec" from get_pathspec()
7004 grep: use get_pathspec() correctly
7005 fix overstrict :<path> diagnosis
7006 fix overslow :/no-such-string-ever-existed diagnostics
7007 rev/path disambiguation: further restrict "misspelled index entry" diag
7008 Revert "completion: don't declare 'local words' to make zsh happy"
7009 Update draft release notes to 1.7.6
7010 revision.c: leave a note for "a lone :" enhancement
7011 Update draft release notes to 1.7.6
7012 Bigfile: teach "git add" to send a large file straight to a pack
7013 Declare lookup_replace_object() in cache.h, not in commit.h
7014 t6050: make sure we test not just commit replacement
7015 read_sha1_file(): get rid of read_sha1_file_repl() madness
7016 inline lookup_replace_object() calls
7017 read_sha1_file(): allow selective bypassing of replacement mechanism
7018 Sync release notes for 1.7.6 to exclude what are in maintenance track
7019 git-grep: update tests now regexp type is "last one wins"
7020 Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
7021 Update release notes to 1.7.6
7022 notes remove: allow removing more than one
7023 notes remove: --ignore-missing
7024 notes remove: --stdin reads from the standard input
7025 show: --ignore-missing
7026 Revert "Merge branch 'en/merge-recursive'"
7027 Update draft release notes to 1.7.6
7028 Update 1.7.6 draft release notes
7029 require-work-tree wants more than what its name says
7030 compat/fnmatch/fnmatch.c: give a fall-back definition for NULL
7031 Update 1.7.6 draft release notes
7032 log: --quiet should serve as synonym to -s
7033 Update draft release notes to 1.7.6
7036 git-p4: add option to preserve user names
7037 git-p4: small improvements to user-preservation
7038 git-p4: warn if git authorship won't be retained
7040 Marius Storm-Olsen (1):
7041 Automatically autoload bashcompinit for ZSH, when needed
7043 Martin von Zweigbergk (34):
7044 rebase: clearer names for directory variables
7045 rebase: refactor reading of state
7046 rebase: read state outside loop
7047 rebase: remove unused rebase state 'prev_head'
7048 rebase: improve detection of rebase in progress
7049 rebase: act on command line outside parsing loop
7050 rebase: stricter check of standalone sub command
7051 rebase: align variable names
7052 rebase: align variable content
7053 rebase: factor out command line option processing
7054 rebase -i: remove now unnecessary directory checks
7055 rebase: reorder validation steps
7056 rebase: factor out reference parsing
7057 rebase: factor out clean work tree check
7058 rebase: factor out call to pre-rebase hook
7059 rebase -i: support --stat
7060 rebase: remove $branch as synonym for $orig_head
7061 rebase: extract merge code to new source file
7062 rebase: extract am code to new source file
7063 rebase: show consistent conflict resolution hint
7064 rebase -i: align variable names
7065 rebase: make -v a tiny bit more verbose
7066 rebase: factor out sub command handling
7067 rebase: extract code for writing basic state
7068 rebase: remember verbose option
7069 rebase: remember strategy and strategy options
7070 rebase -m: remember allow_rerere_autoupdate option
7071 rebase -m: don't print exit code 2 when merge fails
7072 git-rebase--am: remove unnecessary --3way option
7073 rebase -i: don't read unused variable preserve_merges
7074 rebase -i: remove unnecessary state rebase-root
7075 rebase: use @{upstream} if no upstream specified
7076 Makefile: do not install sourced rebase scripts
7077 rebase: define options in OPTIONS_SPEC
7079 Mathias Lafeldt (1):
7080 t/test-lib.sh: minor readability improvements
7082 Michael Haggerty (1):
7083 git-svn: add an option to skip the creation of empty directories
7085 Michael J Gruber (7):
7086 contrib/completion: --notes, --no-notes
7087 rev-list --count: separate count for --cherry-mark
7088 t1020: test !alias in subdirectory
7089 handle_alias: provide GIT_PREFIX to !alias
7090 config: define and document exit codes
7091 config: Give error message when not changing a multivar
7092 sh-18n: quell "unused variable" warning
7094 Michael Schubert (2):
7095 tag: disallow '-' as tag name
7096 ls-remote: the --exit-code option reports "no matching refs"
7098 Michał Kiedrowicz (11):
7099 Documentation: Add --line-number to git-grep synopsis
7100 contrib/completion: --line-number to git grep
7101 grep: Put calls to fixmatch() and regmatch() into patmatch()
7102 grep: Fix a typo in a comment
7103 grep: Extract compile_regexp_failed() from compile_regexp()
7104 git-grep: Learn PCRE
7105 configure: Check for libpcre
7106 grep: Add basic tests
7107 git-grep: Bail out when -P is used with -F or -E
7108 git-grep: Update tests (mainly for -P)
7109 git-grep: Fix problems with recently added tests
7112 blame: add --abbrev command line option and make it honor core.abbrev
7114 Nguyễn Thái Ngọc Duy (8):
7115 Reimplement read_tree_recursive() using tree_entry_interesting()
7116 Convert read_tree{,_recursive} to support struct pathspec
7117 Improve tree_entry_interesting() handling code
7118 setup: return correct prefix if worktree is '/'
7119 Kill off get_relative_cwd()
7120 t1011: fix sparse-checkout initialization and add new file
7121 sparse checkout: do not eagerly decide the fate for whole directory
7122 t3703, t4208: add test cases for magic pathspec
7124 Nicolas Morey-Chaisemartin (1):
7125 submodule: Add --force option for git submodule update
7127 Rafael Gieschke (1):
7128 ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd
7130 Ramsay Allan Jones (9):
7131 Makefile: Use cgcc rather than sparse in the check target
7132 sparse: Fix an "symbol 'cmd_index_pack' not declared" warning
7133 sparse: Fix some "Using plain integer as NULL pointer" warnings
7134 sparse: Fix an "symbol 'format_subject' not declared" warning
7135 sparse: Fix an "symbol 'merge_file' not decared" warning
7136 sparse: Fix errors due to missing target-specific variables
7137 sparse: Fix some "symbol not declared" warnings
7138 setup.c: Fix some "symbol not declared" sparse warnings
7139 config.c: Remove unused git_config_global() function
7142 strbuf: clarify assertion in strbuf_setlen()
7145 completion: don't modify the $cur variable in completion functions
7146 completion: remove unnecessary _get_comp_words_by_ref() invocations
7147 completion: don't declare 'local words' to make zsh happy
7149 Sebastien Cevey (3):
7150 gitweb: Split git_project_list_body in two functions
7151 gitweb: Modularized git_get_project_description to be more generic
7152 gitweb: Optional grouping of projects by category
7155 t5541-http-push: add test for chunked
7157 Ævar Arnfjörð Bjarmason (5):
7158 git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()
7159 git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers
7160 git-sh-i18n.sh: add GIT_GETTEXT_POISON support
7161 Makefile: add xgettext target for *.sh files
7162 git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
7165 Version v1.7.5.4; changes since v1.7.5.3:
7166 -----------------------------------------
7169 Documentation/technical/api-diff.txt: correct name of diff_unmerge()
7170 git-submodule.sh: separate parens by a space to avoid confusing some shells
7173 config: make environment parsing routines static
7174 git_config: don't peek at global config_parameters
7175 config: always parse GIT_CONFIG_PARAMETERS during git_config
7176 read_gitfile_gently: use ssize_t to hold read result
7177 docs: minor grammar fixes to git-status
7178 docs: update status --porcelain format
7179 docs: make sure literal "->" isn't converted to arrow
7180 docs: fix some antique example output
7183 rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
7184 remove tests of always-false condition
7185 diffcore-rename.c: avoid set-but-not-used warning
7187 Jonathan Nieder (3):
7188 tests: check error message from run_command
7189 run-command: handle short writes and EINTR in die_child
7190 Documentation: do not misinterpret refspecs as bold text
7192 Junio C Hamano (26):
7193 builtin/diff.c: remove duplicated call to diff_result_code()
7194 diffcore-rename: refactor "too many candidates" logic
7195 diffcore-rename: record filepair for rename src
7196 diffcore-rename: fall back to -C when -C -C busts the rename limit
7197 i18n: do not overuse C_LOCALE_OUTPUT
7198 i18n: .git file is not a human readable message (t5601)
7199 i18n: use test_i18ncmp in t1200 and t2200
7200 i18n: do not overuse C_LOCALE_OUTPUT (grep)
7201 i18n: use test_i18ngrep in lib-httpd and t2019
7202 i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
7203 i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
7204 i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
7205 i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
7206 i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
7207 i18n: use test_i18ngrep in t7201
7208 i18n: use test_i18ncmp in t7500
7209 i18n: use test_i18ngrep in t7501
7210 i18n: use test_i18ngrep and test_i18ncmp in t7502
7211 i18n: use test_i18ngrep in t7506
7212 i18n: use test_i18n{grep,cmp} in t7508
7213 i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
7214 handle_options(): do not miscount how many arguments were used
7215 userformat_find_requirements(): find requirement for the correct format
7216 config.mak.in: allow "configure --sysconfdir=/else/where"
7217 Start 1.7.5.4 draft release notes
7220 Mathias Lafeldt (1):
7221 t/README: unify documentation of test function args
7223 Ramkumar Ramachandra (4):
7224 Documentation: Add filter.<driver>.* to config
7225 Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
7226 Documentation: Add diff.<driver>.* to config
7227 Documentation: Allow custom diff tools to be specified in 'diff.tool'
7230 add -i: ignore terminal escape sequences
7232 Valentin Haenel (5):
7233 config.txt: 'interactive.singlekey; is used by...
7234 git-add.txt: document 'interactive.singlekey'
7235 git-stash.txt: better docs for '--patch'
7236 git-checkout.txt: better docs for '--patch'
7237 git-reset.txt: better docs for '--patch'
7239 Ævar Arnfjörð Bjarmason (7):
7240 i18n: mark merge "Could not read from" message for translation
7241 i18n: mark merge "upstream" messages for translation
7242 i18n: mark merge CHERRY_PICK_HEAD messages for translation
7243 i18n: mark clone nonexistent repository message for translation
7244 i18n: mark checkout --detach messages for translation
7245 i18n: mark checkout plural warning for translation
7246 i18n: mark init-db messages for translation
7249 Version v1.7.5.3; changes since v1.7.5.2:
7250 -----------------------------------------
7252 Felipe Contreras (1):
7253 git-completion: fix regression in zsh support
7255 Fraser Tweedale (1):
7256 gitweb: supply '-n' to gzip for identical output
7259 send-pack: unbreak push over stateless rpc
7260 cherry-pick: handle root commits with external strategies
7261 revert: allow reverting a root commit
7262 t3503: test cherry picking and reverting root commits
7263 connect: treat generic proxy processes like ssh processes
7264 connect: let callers know if connection is a socket
7265 send-pack: avoid deadlock on git:// push with failed pack-objects
7266 test core.gitproxy configuration
7269 do not read beyond end of malloc'd buffer
7272 Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
7273 send-pack: avoid deadlock when pack-object dies early
7274 Honor $(prefix) set in config.mak* when defining ETC_GIT*
7276 Jonathan Nieder (5):
7277 Revert "t0081 (line-buffer): add buffering tests"
7278 Documentation: explain how to check for patch corruption
7279 Documentation: hints for sending patches inline with Thunderbird
7280 Documentation: publicize KMail hints for sending patches inline
7281 Documentation: publicize hints for sending patches with GMail
7284 Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir"
7285 setup_revisions(): take pathspec from command line and --stdin correctly
7286 sideband_demux(): fix decl-after-stmt
7290 Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
7292 Michael J Gruber (2):
7293 config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
7294 git-svn: Fix git svn log --show-commit
7296 Nguyễn Thái Ngọc Duy (1):
7297 init/clone: remove short option -L and document --separate-git-dir
7299 Rafael Gieschke (1):
7300 copy_gecos: fix not adding nlen to len when processing "&"
7302 Stefan Sperling (1):
7303 remove noise and inaccuracies from git-svn docs
7306 Version v1.7.5.2; changes since v1.7.5.1:
7307 -----------------------------------------
7310 git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
7312 Brian Gernhardt (1):
7313 t/annotate-tests: Use echo & cat instead of sed
7315 Carlos Martín Nieto (2):
7316 format-patch: don't pass on the --quiet flag
7317 format-patch: document --quiet option
7320 Pass empty file to p4merge where no base is suitable.
7323 shell: add missing initialization of argv0_path
7326 Look for password in both CVS and CVSNT password files.
7329 git-instaweb: Simplify build dependency on gitweb
7330 Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
7333 pretty: quote rfc822 specials in email addresses
7334 add tests for merge-index / merge-one-file
7335 merge-one-file: fix broken merges with alternate work trees
7338 Documentation/git-fsck.txt: fix typo: unreadable -> unreachable
7341 t5400: Fix a couple of typos
7343 Jonathan Nieder (4):
7344 Restructure documentation for git-merge-base.
7345 Documentation: describe the format of messages with inline patches
7346 add, merge, diff: do not use strcasecmp to compare config variable names
7347 provide a copy of the LGPLv2.1
7350 mergetool: Teach about submodules
7353 blame: tolerate bogus e-mail addresses a bit better
7356 Remove duplicated "is a"
7358 Junio C Hamano (19):
7359 test: use $_z40 from test-lib
7360 diff.c: return filepair from diff_unmerge()
7361 diff: remove often unused parameters from diff_unmerge()
7362 diff-files: show unmerged entries correctly
7363 Fix "add -u" that sometimes fails to resolve unmerged paths
7364 add -p: 'q' should really quit
7365 t3701: Editing a split hunk in an "add -p" session
7366 add--interactive.perl: factor out repeated --recount option
7367 "add -p": work-around an old laziness that does not coalesce hunks
7368 t3701: fix here document
7369 merge: make branch.<name>.mergeoptions correctly override merge.<option>
7370 t3701: add-p-fix makes the last test to pass
7371 t1507: avoid "${parameter<op>'word'}" inside double-quotes
7374 git_open_noatime(): drop unused parameter
7375 Update draft release notes to 1.7.5.2
7376 Update draft release notes to 1.7.5.2
7379 Martin von Zweigbergk (1):
7380 diffcore-rename: don't consider unmerged path as source
7382 Michael J Gruber (1):
7383 git-fast-import.txt: --relative-marks takes no parameter
7385 Sebastian Schuberth (1):
7386 doc: Clarify that "cherry-pick -x" does not use "git notes"
7388 Sverre Rabbelier (1):
7389 fast-import: fix option parser for no-arg options
7391 Valentin Haenel (3):
7392 git-svn.txt: fix usage of --add-author-from
7393 git-svn.txt: move option descriptions
7394 git-svn.txt: small typeface improvements
7396 Vincent van Ravesteijn (1):
7397 Documentation: update to git-merge-base --octopus
7400 Version v1.7.5.1; changes since v1.7.5:
7401 ---------------------------------------
7404 clean: unreadable directory may still be rmdir-able if it is empty
7407 stash: add two more tests for --no-keep-index
7408 stash: ensure --no-keep-index and --patch can be used in any order
7411 stash: fix accidental apply of non-existent stashes
7412 stash: drop dirty worktree check on apply
7413 upload-pack: start pack-objects before async rev-list
7416 --dirstat: Describe non-obvious differences relative to --stat or regular diff
7417 --dirstat-by-file: Make it faster and more correct
7418 Teach --dirstat not to completely ignore rearranged lines within a file
7419 --dirstat: In case of renames, use target filename instead of source filename
7422 stash: fix false positive in the invalid ref test.
7425 Teach core.bigfilethreashold to pack-objects
7426 http: clear POSTFIELDS when initializing a slot
7427 Start 1.7.5.1 maintenance track
7430 Michael J Gruber (6):
7431 builtin/log.c: separate default and setup of cmd_log_init()
7432 t/t1411: test reflog with formats
7433 reflog: fix overriding of command line options
7434 t1506: factor out test for "Did you mean..."
7435 sha1_name: Suggest commit:./file for path in subdir
7436 date: avoid "X years, 12 months" in relative dates
7439 git-send-email: fix missing space in error message
7441 Valentin Haenel (1):
7442 git-add.txt: document 'add.ignoreErrors'
7445 Version v1.7.5; changes since v1.7.5-rc3:
7446 -----------------------------------------
7452 Version v1.7.5-rc3; changes since v1.7.5-rc2:
7453 ---------------------------------------------
7456 Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"
7460 Michael J Gruber (3):
7461 git.txt: fix list continuation
7462 t3306,t5304: avoid clock skew issues
7463 git-svn.txt: Document --mergeinfo
7466 archive: document limitation of tar.umask config setting
7469 Version v1.7.5-rc2; changes since v1.7.5-rc1:
7470 ---------------------------------------------
7472 Alejandro R. Sedeño (1):
7473 git-svn: Add a svn-remote.<name>.pushurl config key
7476 gitk: Take only numeric version components when computing $git_version
7477 gitk: Update cherry-pick error message parsing
7480 git-p4: replace each tab with 8 spaces for consistency
7483 git-svn: Cache results of running the executable "git config"
7486 remove doubled words, e.g., s/to to/to/, and fix related typos
7489 t0001: guard a new test with SYMLINKS prerequisite
7490 t2021: mark a test as fixed
7496 gitk: Quote tag names in event bindings to avoid problems with % chars
7499 gitk: Allow user to control how much of the SHA1 ID gets auto-selected
7501 Ramkumar Ramachandra (1):
7502 revert: Hide '-r' option in default usage
7504 Ramsay Allan Jones (1):
7505 i18n: avoid parenthesized string as array initializer
7508 gitk: spelling fixes in Russian translation
7510 Ævar Arnfjörð Bjarmason (1):
7511 Makefile: extract Q_() source strings as ngettext()
7514 Version v1.7.5-rc1; changes since v1.7.5-rc0:
7515 ---------------------------------------------
7518 Remove old binaries from .gitignore
7519 Fix two unused variable warnings in gcc 4.6
7522 gitweb: Fix parsing of negative fractional timezones in JavaScript
7525 merge: match the help text with the documentation
7528 merge: merge unborn index before setting ref
7529 pull: do not clobber untracked files on initial pull
7530 remote: disallow some nonsensical option combinations
7531 remote: separate the concept of push and fetch mirrors
7532 remote: deprecate --mirror
7533 docs: fix filter-branch subdir example for exotic repo names
7534 pull: do not clobber untracked files on initial pull
7537 fetch/pull: recurse into submodules when necessary
7538 fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
7539 config: teach the fetch.recurseSubmodules option the 'on-demand' value
7540 Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
7541 fetch/pull: Don't recurse into a submodule when commits are already present
7542 submodule update: Don't fetch when the submodule commit is already present
7543 fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
7546 grep: allow -E and -n to be turned on by default via configuration
7548 Jonathan Nieder (1):
7549 compat: add missing #include <sys/resource.h>
7552 merge: merge with the default upstream branch without argument
7553 "log --cherry-pick" documentation regression fix
7554 Doc: mention --delta-base-offset is the default for Porcelain commands
7556 Update release notes
7557 Start preparing for 1.7.4.4
7561 Lawrence Mitchell (1):
7562 git.el: Don't use font-lock-compile-keywords
7564 Michael J Gruber (3):
7565 revisions.txt: consistent use of quotes
7566 revisions.txt: structure with a labelled list
7567 revisions.txt: language improvements
7569 Nguyễn Thái Ngọc Duy (2):
7570 git-init.txt: move description section up
7571 init, clone: support --separate-git-dir for .git file
7573 Nicolas Morey-Chaisemartin (1):
7574 submodule: process conflicting submodules only once
7577 Documentation: trivial grammar fix in core.worktree description
7580 Makefile: Cover more files with make check
7581 sparse: Fix errors and silence warnings
7583 Ævar Arnfjörð Bjarmason (70):
7584 i18n: git-init basic messages
7585 i18n: git-init "Initialized [...] repository" message
7586 i18n: git-clone basic messages
7587 i18n: git-clone "Cloning into" message
7588 i18n: git-clone "Cloning into" message
7589 i18n: git-add basic messages
7590 i18n: git-add "The following paths are ignored" message
7591 i18n: git-add "did not match any files" message
7592 i18n: git-add "remove '%s'" message
7593 i18n: git-add "Unstaged changes" message
7594 i18n: git-branch basic messages
7595 i18n: git-branch "remote branch '%s' not found" message
7596 i18n: git-branch "Deleted branch [...]" message
7597 i18n: git-branch "git branch -v" messages
7598 i18n: git-branch "(no branch)" message
7599 i18n: git-checkout basic messages
7600 i18n: git-checkout: our/their version message
7601 i18n: git-checkout describe_detached_head messages
7602 i18n: git-checkout "HEAD is now at" message
7603 i18n: git-checkout "Switched to a .. branch" message
7604 i18n: git-commit basic messages
7605 i18n: git-commit "middle of a merge" message
7606 i18n: git-commit formatting messages
7607 i18n: git-commit print_summary messages
7608 i18n: git-commit "enter the commit message" message
7609 i18n: git-commit advice messages
7610 i18n: git-diff basic messages
7611 i18n: git-fetch basic messages
7612 i18n: git-fetch formatting messages
7613 i18n: git-fetch update_local_ref messages
7614 i18n: git-fetch split up "(non-fast-forward)" message
7615 i18n: git-grep basic messages
7616 i18n: git-grep "--open-files-in-pager" message
7617 i18n: git-log basic messages
7618 i18n: git-log "--OPT does not make sense" messages
7619 i18n: git-merge basic messages
7620 i18n: git-merge "Updating %s..%s" message
7621 i18n: git-merge "You have not concluded your merge" messages
7622 i18n: git-merge "Wonderful" message
7623 i18n: git-mv basic messages
7624 i18n: git-mv "bad" messages
7625 i18n: git-rm basic messages
7626 i18n: git-reset basic messages
7627 i18n: git-reset reset_type_names messages
7628 i18n: git-reset "Unstaged changes after reset" message
7629 i18n: git-tag basic messages
7630 i18n: git-tag tag_template message
7631 i18n: git-push basic messages
7632 i18n: git-push "prevent you from losing" message
7633 i18n: git-status basic messages
7634 i18n: git-status "nothing to commit" messages
7635 i18n: git-status shortstatus messages
7636 i18n: git-status "Changes to be committed" message
7637 i18n: git-status "Initial commit" message
7638 i18n: git-status "renamed: " message
7639 i18n: git-archive basic messages
7640 i18n: git-bundle basic messages
7641 i18n: git-clean basic messages
7642 i18n: git-clean clean.requireForce messages
7643 i18n: git-describe basic messages
7644 i18n: git-gc basic messages
7645 i18n: git-gc "Auto packing the repository" message
7646 i18n: git-notes basic commands
7647 i18n: git-notes GIT_NOTES_REWRITE_MODE error message
7648 i18n: git-revert basic messages
7649 i18n: git-revert "Your local changes" message
7650 i18n: git-revert literal "me" messages
7651 i18n: git-revert split up "could not revert/apply" message
7652 i18n: git-shortlog basic messages
7653 t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT
7656 Version v1.7.5-rc0; changes since v1.7.4.5:
7657 -------------------------------------------
7660 git-gui: update russian translation
7661 git-gui: update russian translation
7663 Alexandre Erwin Ittner (1):
7664 git-gui: add Brazilian Portuguese (pt-BR) translation
7667 git-gui: fix ANSI-color parsing
7668 git-gui: respect conflict marker size
7669 git-gui: fix browsers [Up To Parent] in sub-sub-directories.
7670 git-gui: Fix use of renamed tag.
7671 git-gui: Fix use of hunk tag for non-hunk content.
7672 git-gui: fix typo in image data
7673 git-gui: remove 'no such variable' for s error when encounter unknown file states
7674 git-gui: learn more type change states
7675 git-gui: rework handling of diff header
7676 git-gui: handle index lines only in the diff header
7677 git-gui: name also new symlinks so
7678 git-gui: there is no "mode *" diff header line
7679 git-gui: move 3way diff autodetect up
7680 git-gui: always reset the current tag
7681 git-gui: handle special content lines only in the diff header section
7682 git-gui: handle meta diff header lines only in the header section
7684 Carlo Marcelo Arenas Belon (1):
7685 setup: translate symlinks in filename when using absolute paths
7687 Carlos Martín Nieto (1):
7688 Name make_*_path functions more accurately
7691 vcs-svn: Allow simple v3 dumps (no deltas yet)
7692 vcs-svn: Implement Prop-delta handling
7693 fast-import: add 'ls' command
7694 vcs-svn: use strbuf for revision log
7695 vcs-svn: use strbuf for author, UUID, and URL
7696 vcs-svn: implement perfect hash for node-prop keys
7697 vcs-svn: implement perfect hash for top-level keys
7698 vcs-svn: use strchr to find RFC822 delimiter
7701 Documentation: "rebase <onto> <that>" stays on <that> branch upon exit
7704 Make rev-list --objects work together with pathspecs
7705 Add testcases showing how pathspecs are handled with rev-list --objects
7708 alias: use run_command api to execute aliases
7710 Giuseppe Bilotta (1):
7711 Improve test for pthreads flag
7714 git gui: keep selected branch when remote is changed in push dialog
7715 git-gui: scroll down to default selection for push dialog
7716 git-gui: instead of defaulting to home directory use working directory
7717 mingw: move unlink wrapper to mingw.c
7718 mingw: work around irregular failures of unlink on windows
7719 mingw: make failures to unlink or move raise a question
7720 mingw: add fallback for rmdir in case directory is in use
7721 git-gui: fix deleting item from all_remotes variable
7722 git-gui: always default to the last merged branch in remote delete
7723 git-gui: refactor remote submenu creation into subroutine
7724 git-gui: teach fetch/prune menu to do it for all remotes
7725 git-gui: fetch/prune all entry only for more than one entry
7726 git-gui: fetch/prune all entry appears last
7729 Obey p4 views when using client spec
7732 object.h: Remove obsolete struct object_refs
7733 git-completion: Add git help completion for aliases
7736 gitweb: Make i18n (encoding) tests in t9500 leave clean state
7739 git-checkout.txt: improve detached HEAD documentation
7740 Introduce CHERRY_PICK_HEAD
7741 bash: teach __git_ps1 about CHERRY_PICK_HEAD
7742 Teach commit about CHERRY_PICK_HEAD
7745 merge: improve inexact rename limit warning
7746 bump rename limit defaults (again)
7747 commit: stop setting rename limit
7748 add inexact rename detection progress infrastructure
7749 merge: enable progress reporting for rename detection
7750 pull: propagate --progress to merge
7751 compat: provide a fallback va_copy definition
7752 strbuf: add strbuf_vaddf
7753 trace: add trace_vprintf
7754 trace: refactor to support multiple env variables
7755 trace: factor out "do we want to trace" logic
7756 trace: add trace_strbuf
7757 add packet tracing debug code
7758 trace: give repo_setup trace its own key
7759 doc: drop author/documentation sections from most pages
7760 doc: add missing git footers
7761 docs: point git.txt author credits to git-scm.com
7762 checkout: add basic tests for detached-orphan warning
7763 checkout: clear commit marks after detached-orphan check
7764 checkout: tweak detached-orphan warning format
7765 t7607: mark known breakage in test 11 as fixed
7766 t7607: clean up stray untracked file
7767 tests: kill backgrounded processes more robustly
7770 tests: fix overeager scrubbing of environment variables
7772 Johannes Schindelin (2):
7773 mingw_rmdir: set errno=ENOTEMPTY when appropriate
7774 Remove unused variables
7777 rerere forget: deprecate invocation without pathspec
7779 Jonathan Nieder (75):
7780 vcs-svn: Check for errors from open()
7781 vcs-svn: Eliminate node_ctx.srcRev global
7782 vcs-svn: Eliminate node_ctx.mark global
7783 vcs-svn: Unclutter handle_node by introducing have_props var
7784 vcs-svn: Use mark to indicate nodes with included text
7785 vcs-svn: handle_node: Handle deletion case early
7786 vcs-svn: Replace = Delete + Add
7787 vcs-svn: Combine repo_replace and repo_modify functions
7788 vcs-svn: Delay read of per-path properties
7789 vcs-svn: Reject path nodes without Node-action
7790 vcs-svn: More dump format sanity checks
7791 vcs-svn: Make source easier to read on small screens
7792 vcs-svn: Split off function for handling of individual properties
7793 vcs-svn: Sharpen parsing of property lines
7794 vcs-svn: Allow change nodes for root of tree (/)
7795 cherry-pick/revert: add support for -X/--strategy-option
7796 unpack-trees: handle lstat failure for existing directory
7797 unpack-trees: handle lstat failure for existing file
7798 userdiff: simplify word-diff safeguard
7799 t4034 (diff --word-diff): style suggestions
7800 glossary: define pathspec
7801 checkout: split off a function to peel away branchname arg
7802 checkout: rearrange update_refs_for_switch for clarity
7803 t3507: introduce pristine-detach helper
7804 checkout: add missing const to describe_detached_head
7805 update-index --refresh --porcelain: add missing const
7806 vcs-svn: eliminate global byte_buffer
7807 vcs-svn: replace buffer_read_string memory pool with a strbuf
7808 vcs-svn: collect line_buffer data in a struct
7809 vcs-svn: teach line_buffer to handle multiple input files
7810 vcs-svn: make test-line-buffer input format more flexible
7811 tests: give vcs-svn/line_buffer its own test script
7812 vcs-svn: tweak test-line-buffer to not assume line-oriented input
7813 t0081 (line-buffer): add buffering tests
7814 vcs-svn: add binary-safe read function
7815 vcs-svn: allow character-oriented input
7816 vcs-svn: allow input from file descriptor
7817 vcs-svn: teach line_buffer about temporary files
7818 fast-import: make code "-Wpointer-arith" clean
7819 vcs-svn: introduce repo_read_path to check the content at a path
7820 vcs-svn: handle_node: use repo_read_path
7821 vcs-svn: simplify repo_modify_path and repo_copy
7822 vcs-svn: allow input errors to be detected promptly
7823 compat: fall back on __va_copy if available
7824 wt-status: add helpers for printing wt-status lines
7825 commit: refer to commit template as s->fp
7826 commit, status: use status_printf{,_ln,_more} helpers
7827 i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set
7828 wt-status: add helpers for printing wt-status lines
7829 commit: refer to commit template as s->fp
7830 commit, status: use status_printf{,_ln,_more} helpers
7831 i18n: add stub Q_() wrapper for ngettext
7832 i18n: "make distclean" should clean up after "make pot"
7833 tests: stop worrying about obsolete environment variables
7834 tests: suppress system gitattributes
7835 gitattributes: drop support for GIT_ATTR_NOGLOBAL
7836 config: drop support for GIT_CONFIG_NOGLOBAL
7837 tests: scrub environment of GIT_* variables
7838 declare 1-bit bitfields to be unsigned
7839 vcs-svn: remove spurious semicolons
7840 mktag: avoid %td in format string
7841 unbreak and eliminate NO_C99_FORMAT
7842 run-command: prettify -D_FORTIFY_SOURCE workaround
7843 vcs-svn: improve support for reading large files
7844 vcs-svn: make buffer_skip_bytes return length read
7845 vcs-svn: make buffer_copy_bytes return length read
7846 vcs-svn: improve reporting of input errors
7847 tests: avoid nonportable {foo,bar} glob
7848 vcs-svn: make reading of properties binary-safe
7849 vcs-svn: remove buffer_read_string
7850 vcs-svn: avoid unnecessary copying of log message and author
7851 vcs-svn: handle log message with embedded NUL
7852 vcs-svn: add missing cast to printf argument
7853 vcs-svn: add missing cast to printf argument
7854 tests: make sure input to sed is newline terminated
7856 Junio C Hamano (29):
7857 unpack-trees.c: cosmetic fix
7858 unpack_trees(): skip trees that are the same in all input
7859 t4034 (diff --word-diff): add a minimum Perl drier test vector
7860 t6004: add pathspec globbing test for log family
7861 checkout: introduce --detach synonym for "git checkout foo^{commit}"
7862 Rename t2019 with typo "amiguous" that meant "ambiguous"
7863 Revert "unpack_trees(): skip trees that are the same in all input"
7864 grep --no-index: honor pathspecs correctly
7865 rev-list: --left/right-only are mutually exclusive
7866 commit: give final warning when reattaching HEAD to leave commits behind
7867 Start preparing release notes to 1.7.5
7868 Update Release Notes to 1.7.5
7869 Update draft release notes to 1.7.5
7870 refs_from_alternate: helper to use refs from alternates
7871 fetch-pack: objects in our alternates are available to us
7872 fetch-pack: factor out hardcoded handshake window size
7873 fetch-pack: progressively use larger handshake windows
7874 fetch-pack: use smaller handshake window for initial request
7875 Update drart release notes to 1.7.5
7876 Update draft release notes to 1.7.5
7877 rerere: make sure it works even in a workdir attached to a young repository
7878 Update draft release note to 1.7.5
7879 Revert "upload-pack: Implement no-done capability"
7880 Revert "fetch-pack: Implement no-done capability"
7881 enable "no-done" extension only when fetching over smart-http
7882 Fix potential local deadlock during fetch-pack
7883 enable "no-done" extension only when serving over smart-http
7884 Revert two "no-done" reverts
7888 gitweb: fix #patchNN anchors when path_info is enabled
7890 Martin von Zweigbergk (2):
7892 mergetool: don't skip modify/remove conflicts
7895 push: better error messages when push.default = tracking
7896 push: better error message when no remote configured
7898 Michael Horowitz (1):
7899 git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
7901 Michael J Gruber (14):
7902 revlist.c: introduce --left/right-only for unsymmetric picking
7903 t6007: Make sure we test --cherry-pick
7904 rev-list: documentation and test for --left/right-only
7905 git-add: make -A description clearer vs. -u
7906 rev-list/log: factor out revision mark generation
7907 revision.c: introduce --cherry-mark
7908 rev-list: documentation and test for --cherry-mark
7909 log --cherry: a synonym
7910 t6007: test rev-list --cherry
7911 git-log: put space after commit mark
7912 RelNotes/1.7.5.txt: typo and language fixes
7913 t6009: use test_commit() from test-lib.sh
7914 revision.c: introduce --min-parents and --max-parents options
7915 rev-list --min-parents,--max-parents: doc, test and completion
7918 vcs-svn: a void function shouldn't try to return something
7920 Nguyễn Thái Ngọc Duy (22):
7922 diff-no-index: use diff_tree_setup_paths()
7923 Convert struct diff_options to use struct pathspec
7924 tree_entry_interesting(): remove dependency on struct diff_options
7925 Move tree_entry_interesting() to tree-walk.c and export it
7926 diff-tree: convert base+baselen to writable strbuf
7927 tree_entry_interesting(): refactor into separate smaller functions
7928 tree_entry_interesting(): support depth limit
7929 tree_entry_interesting(): fix depth limit with overlapping pathspecs
7930 tree_entry_interesting(): support wildcard matching
7931 tree_entry_interesting(): optimize wildcard matching when base is matched
7932 pathspec: add match_pathspec_depth()
7933 struct rev_info: convert prune_data to struct pathspec
7934 Convert ce_path_match() to use struct pathspec
7935 Convert ce_path_match() to use match_pathspec_depth()
7936 grep: convert to use struct pathspec
7937 grep: use match_pathspec_depth() for cache/worktree grepping
7938 grep: use writable strbuf from caller for grep_tree()
7939 grep: drop pathspec_matches() in favor of tree_entry_interesting()
7940 t7810: overlapping pathspecs and depth limit
7941 Make hash-object more robust against malformed objects
7942 git.c: reorder builtin command list
7945 transport-helper.c: fix check for (size_t < 0)
7948 git-gui: Include version check and test for tearoff menu entry
7949 git-gui: detect the use of MUI langauge packs on Windows
7953 git-p4: fix key error for p4 problem
7954 git-p4: add missing newline in initial import message
7955 git-p4: accommodate new move/delete type in p4
7956 git-p4: reinterpret confusing p4 message
7957 git-p4: better message for "git-p4 sync" when not cloned
7958 git-p4: decode p4 wildcard characters
7959 git-p4: support clone --bare
7960 git-p4: fix clone @all regression
7961 git-p4: test clone @all
7962 git-p4: fix sync new branch regression
7963 git-p4: test sync new branch
7965 Piotr Krukowiecki (1):
7966 Documentation: running test with --debug keeps "trash" directory
7968 Ramkumar Ramachandra (1):
7969 fast-import: Introduce --import-marks-if-exists
7972 repo-config: add deprecation warning
7973 grep: read patterns from stdin with -f -
7976 bash: fix misindented esac statement in __git_complete_file()
7977 bash: complete 'git diff ...branc<TAB>'
7979 Sebastian Schuberth (4):
7980 mergetool--lib: Sort tools alphabetically for easier lookup
7981 mergetool--lib: Add Beyond Compare 3 as a tool
7982 mergetool--lib: Sort tools alphabetically for easier lookup
7983 mergetool--lib: Add Beyond Compare 3 as a tool
7986 git-gui: fix russian translation typos
7988 Shawn O. Pearce (6):
7989 smart-http: Don't use Expect: 100-Continue
7990 smart-http: Really never use Expect: 100-continue
7991 fetch-pack: Finish negotation if remote replies "ACK %s ready"
7992 upload-pack: More aggressively send 'ACK %s ready'
7993 fetch-pack: Implement no-done capability
7994 upload-pack: Implement no-done capability
7997 git-gui: spelling fixes in russian translation
8000 git-gui: use --exclude-standard to check for untracked files
8006 Exhibit merge bug that clobbers index&WT
8007 t4034: bulk verify builtin word regex sanity
8010 git-p4: Teach gitConfig method about arguments.
8011 Teach git-p4 to ignore case in perforce filenames if configured.
8012 git-p4: Fix error message crash in P4Sync.commit.
8014 Uwe Kleine-König (2):
8015 get_remote_url(): use the same data source as ls-remote to get remote urls
8016 git-request-pull: open-code the only invocation of get_remote_url
8019 git-p4: Improve rename detection support
8020 git-p4: Add copy detection support
8022 Ævar Arnfjörð Bjarmason (4):
8023 gitignore: add test-mktemp to ignore list
8024 i18n: add no-op _() and N_() wrappers
8025 i18n: add GETTEXT_POISON to simulate unfriendly translator
8026 i18n: Makefile: "pot" target to extract messages marked for translation
8029 Version v1.7.4.5; changes since v1.7.4.4:
8030 -----------------------------------------
8033 t2021: mark a test as fixed
8036 "log --cherry-pick" documentation regression fix
8039 Michael J Gruber (3):
8040 git.txt: fix list continuation
8041 t3306,t5304: avoid clock skew issues
8042 git-svn.txt: Document --mergeinfo
8045 archive: document limitation of tar.umask config setting
8048 Version v1.7.4.4; changes since v1.7.4.3:
8049 -----------------------------------------
8052 git-instaweb: Change how gitweb.psgi is made runnable as standalone app
8053 gitweb: Fix parsing of negative fractional timezones in JavaScript
8056 strbuf: add fixed-length version of add_wrapped_text
8057 format-patch: wrap long header lines
8058 format-patch: rfc2047-encode newlines in headers
8059 pull: do not clobber untracked files on initial pull
8061 Jonathan Nieder (1):
8062 compat: add missing #include <sys/resource.h>
8065 list-objects.c: don't add an unparsed NULL as a pending tree
8066 Rename core.abbrevlength back to core.abbrev
8067 diff/status: refactor opportunistic index update
8068 update $GIT_INDEX_FILE when there are racily clean entries
8069 Start preparing for 1.7.4.4
8073 Sanity-check config variable names
8074 Disallow empty section and variable names
8077 Make the default abbrev length configurable
8080 log: fix --max-count when used together with -S or -G
8082 Michael J Gruber (2):
8083 git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting
8084 git-log.txt,rev-list-options.txt: put option blocks in proper order
8086 Nicolas Morey-Chaisemartin (1):
8087 submodule: process conflicting submodules only once
8090 Documentation: trivial grammar fix in core.worktree description
8093 Version v1.7.4.3; changes since v1.7.4.2:
8094 -----------------------------------------
8097 HOME must be set before calling git-init when creating test repositories
8099 Carlos Martín Nieto (1):
8100 Documentation/config.txt: make truth value of numbers more explicit
8102 Clemens Buchacher (1):
8103 do not overwrite untracked symlinks
8106 git-cvsimport.perl: Bail out right away when reading from the server fails
8109 docs: fix filter-branch subdir example for exotic repo names
8112 grep: Add the option '--line-number'
8115 branch/checkout --track: Ensure that upstream branch is indeed a branch
8118 Demonstrate breakage: checkout overwrites untracked symlink with directory
8119 stash: fix incorrect quoting in cleanup of temporary files
8120 stash: copy the index using --index-output instead of cp -p
8123 checkout: fix bug with ambiguous refs
8124 apply: do not patch lines that were already patched
8125 apply -v: show offset count when patch did not apply exactly
8126 diff --quiet: disable optimization when --diff-filter=X is used
8127 doc: technical details about the index file format
8128 t8001: check the exit status of the command being tested
8129 parse-remote: typofix
8130 Doc: mention --delta-base-offset is the default for Porcelain commands
8134 contrib/thunderbird-patch-inline: do not require bash to run the script
8136 Michael J Gruber (2):
8137 git-bisect.txt: streamline run presentation
8138 git-bisect.txt: example for bisecting with hot-fix
8141 git tag documentation grammar fixes and readability updates
8143 strbuf.h: remove a tad stale docs-in-comment and reference api-doc instead
8145 Nguyễn Thái Ngọc Duy (1):
8146 doc: technical details about the index file format
8148 Piotr Krukowiecki (2):
8149 git stash: show status relative to current directory
8150 Add test: git stash shows status relative to current dir
8153 parse-remote: replace unnecessary sed invocation
8154 git-pack-objects.txt: fix grammatical errors
8157 Version v1.7.4.2; changes since v1.7.4.1:
8158 -----------------------------------------
8161 diff format documentation: clarify --cc and -c
8164 Documentation: remove redundant colons in git-for-each-ref.txt
8165 Add Author and Documentation sections to git-for-each-ref.txt
8166 docs: fix grammar in gitattributes.txt
8169 Improve error messages when temporary file creation fails
8172 Work around broken ln on solaris as used in t8006
8174 Carlos Martín Nieto (3):
8175 valgrind: ignore SSE-based strlen invalid reads
8176 make_absolute_path: return the input path if it points to our buffer
8177 t/README: Add a note about running commands under valgrind
8179 Clemens Buchacher (1):
8180 Documentation: clarify -u<mode> option defaults
8183 branch_merged: fix grammar in warning
8186 mingw: add minimum getrlimit() compatibility stub
8189 gitweb: Always call parse_date with timezone parameter
8190 gitweb: Fix handling of fractional timezones in parse_date
8193 merge: honor prepare-commit-msg hook
8196 string_list_append: always set util pointer to NULL
8197 clone: die when trying to clone missing local path
8198 diff: handle diffstat of rewritten binary files
8199 diff: don't retrieve binary blobs for diffstat
8200 bisect: visualize with git-log if gitk is unavailable
8203 push.default: Rename 'tracking' to 'upstream'
8205 Jonathan Nieder (9):
8206 correct type of EMPTY_TREE_SHA1_BIN
8207 tests: skip terminal output tests on OS X
8208 commit: error out for missing commit message template
8209 enums: omit trailing comma for portability
8210 compat: make gcc bswap an inline function
8211 standardize brace placement in struct definitions
8212 branch: split off function that writes tracking info and commit subject
8213 cherry: split off function to print output lines
8214 diff --submodule: split into bite-sized pieces
8217 CodingGuidelines: downcase placeholders in usage messages
8218 verify-pack: add --stat-only to the synopsis section
8219 SubmittingPatches: clarify the expected commit log description
8220 Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"
8221 Prepare draft release notes to 1.7.4.2
8222 bisect: explain the rationale behind 125
8223 Update draft release notes to 1.7.4.2
8227 gitweb: highlight: replace tabs with spaces
8230 for_each_hash: allow passing a 'void *data' pointer to callback
8231 diffcore-rename: properly honor the difference between -M and -C
8232 diffcore-rename: improve estimate_similarity() heuristics
8234 Masatake Osanai (1):
8235 perl: command_bidi_pipe() method should set-up git environmens
8237 Mathias Lafeldt (1):
8238 Fix typo in t/README
8240 Michael J Gruber (16):
8241 commit,tag: use same wording for -F
8242 commit,status: describe --porcelain just like push
8243 clone,init: describe --template using the same wording
8244 commit,merge,tag: describe -m likewise
8245 add: describe --patch like checkout, reset
8246 commit,status: describe -u likewise
8247 git-tag.txt: list all modes in the description
8248 pull: do not display fetch usage on --help-all
8249 Make <identifier> lowercase as per CodingGuidelines
8250 Make <identifier> lowercase as per CodingGuidelines
8251 Make <identifier> lowercase as per CodingGuidelines
8252 Make <identifier> lowercase in Documentation
8253 git-patch-id: test for "no newline" markers
8254 git-patch-id: do not trip over "no newline" markers
8255 mergetool-lib: call vim in readonly mode for diffs
8256 rev-list-options.txt: typo fix
8259 Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
8260 git-compat-util.h: Honor HP C's noreturn attribute
8262 Michał Kiedrowicz (1):
8263 Documentation: fix a typo in git-apply.txt
8265 Nguyễn Thái Ngọc Duy (2):
8266 parse_tag_buffer(): do not prefixcmp() out of range
8267 init: remove unnecessary check
8269 Piotr Krukowiecki (1):
8270 ls-remote documentation: <refs> argument is optional
8272 Ralf Wildenhues (1):
8273 configure: use AC_LANG_PROGRAM consistently
8276 git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
8278 Shawn O. Pearce (2):
8279 Limit file descriptors used by packs
8280 sha1_file.c: Don't retain open fds on small packs
8282 Spencer E. Olson (2):
8283 submodule: no [--merge|--rebase] when newly cloned
8284 t7406: "git submodule update {--merge|--rebase]" with new submodules
8286 Ævar Arnfjörð Bjarmason (4):
8287 gitweb/gitweb.perl: remove use of qw(...) as parentheses
8288 gitweb/gitweb.perl: don't call S_ISREG() with undef
8289 t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate
8290 t/t7500-commit.sh: use test_cmp instead of test
8293 Version v1.7.4.1; changes since v1.7.4:
8294 ---------------------------------------
8297 clone: fixup recurse_submodules option
8300 gitweb: Mention optional Perl modules in INSTALL
8303 t5526: Fix wrong argument order in "git config"
8304 pull: Document the "--[no-]recurse-submodules" options
8307 start_command: flush buffers in the WIN32 code path as well
8308 t4120-apply-popt: help systems with core.filemode=false
8310 Jonathan Nieder (5):
8311 quote.h: simplify the inclusion
8312 fast-import: clarify documentation of "feature" command
8313 fast-import: introduce "feature notes" command
8314 compat: helper for detecting unsigned overflow
8315 svn-fe: warn about experimental status
8318 fsck: drop unused parameter from traverse_one_object()
8319 fsck: do not give up too early in fsck_dir()
8322 Nguyễn Thái Ngọc Duy (4):
8323 diff: support --cached on unborn branches
8324 Add const to parse_{commit,tag}_buffer()
8325 sha1_file.c: move find_cached_object up so sha1_object_info can use it
8326 sha1_object_info: examine cached_object store too
8329 t3509: use unconstrained initial test to setup repository.
8330 t7407: fix line endings for mingw build
8332 Shawn O. Pearce (1):
8333 bundle: Use OFS_DELTA in bundle files
8335 Sitaram Chamarty (1):
8336 post-receive-email: suppress error if description file missing
8338 Uwe Kleine-König (1):
8339 Documentation/merge subtree How-To: fix typo
8342 Version v1.7.4; changes since v1.7.4-rc3:
8343 -----------------------------------------
8346 Don't pass "--xhtml" to hightlight in gitweb.perl script.
8349 rebase: use explicit "--" with checkout
8350 rebase: give a better error message for bogus branch
8351 tests: sanitize more git environment variables
8353 Jonathan Nieder (2):
8354 fast-import: treat filemodify with empty tree as delete
8355 rebase -i: clarify in-editor documentation of "exec"
8361 Version v1.7.4-rc3; changes since v1.7.4-rc2:
8362 ---------------------------------------------
8365 userdiff: match Pascal class methods
8367 Björn Steinbrink (1):
8368 Correctly report corrupted objects
8371 exec_cmd: remove unused extern
8374 Fix expected values of setup tests on Windows
8375 t/README: hint about using $(pwd) rather than $PWD in tests
8377 Jonathan Nieder (9):
8378 ll-merge: simplify opts == NULL case
8379 Documentation/fast-import: capitalize beginning of sentence
8380 remote-ext: do not segfault for blank lines
8381 Documentation/fast-import: put explanation of M 040000 <dataref> "" in context
8382 tests: cosmetic improvements to the repo-setup test
8383 tests: compress the setup tests
8384 Documentation: do not treat reset --keep as a special case
8385 Subject: setup: officially support --work-tree without --git-dir
8386 t1510: fix typo in the comment of a test
8389 Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase
8392 Ramsay Allan Jones (1):
8393 svndump.c: Fix a printf format compiler warning
8396 Version v1.7.4-rc2; changes since v1.7.4-rc1:
8397 ---------------------------------------------
8400 Mark gitk script executable
8403 trace.c: ensure NULL is not passed to printf
8404 t0001,t1510,t3301: use sane_unset which always returns with status 0
8405 t3032: limit sed branch labels to 8 characters
8408 docs: explain diff.*.binary option
8410 Jonathan Nieder (3):
8411 diff: funcname and word patterns for perl
8412 gitweb: make logo optional
8413 t9010: svnadmin can fail even if available
8416 userdiff/perl: catch BEGIN/END/... and POD as headers
8420 commit: suggest --amend --reset-author to fix commiter identity
8422 Michael J Gruber (1):
8423 RelNotes/1.7.4: minor fixes
8425 Ramsay Allan Jones (7):
8426 lib-git-svn.sh: Move web-server handling code into separate function
8427 t9157-*.sh: Add an svn version check
8428 t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
8429 t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
8430 t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
8431 t4135-*.sh: Skip the "backslash" tests on cygwin
8432 t9157-*.sh: Make the svn version check more precise
8435 git svn: fix the final example in man page
8438 gitweb: add extensions to highlight feature map
8439 gitweb: remove unnecessary test when closing file descriptor
8442 Documentation/git-archive: spell --worktree-attributes correctly
8443 Documentation/githooks: post-rewrite-copy-notes never existed
8444 submodule: fix relative url parsing for scp-style origin
8445 t0000: quote TAP snippets in test code
8448 Version v1.7.4-rc1; changes since v1.7.4-rc0:
8449 ---------------------------------------------
8452 t/t9001-send-email.sh: fix '&&' chain in some tests
8454 Jonathan Nieder (3):
8455 vcs-svn: Error out for v3 dumps
8456 gitweb: skip logo in atom feed when there is none
8457 daemon: support <directory> arguments again
8460 t0021: avoid getting filter killed with SIGPIPE
8464 Michael J Gruber (2):
8465 cvsimport: partial whitespace cleanup
8466 cvsimport: handle the parsing of uppercase config options
8469 convert filter: supply path to external driver
8471 Ralf Wildenhues (1):
8472 Fix typos in the documentation
8474 Robin H. Johnson (1):
8475 t9001: Fix test prerequisites
8478 Version v1.7.4-rc0; changes since v1.7.3.5:
8479 -------------------------------------------
8482 status: show branchname with a configurable color
8484 Alexander Sulfrian (2):
8485 daemon: add helper function named_sock_setup
8486 daemon: allow more than one host address given via --listen
8488 Alexandre Erwin Ittner (1):
8489 gitk: Add Brazilian Portuguese (pt-BR) translation
8492 describe: Use for_each_rawref
8493 describe: Do not use a flex array in struct commit_name
8494 describe: Store commit_names in a hash table by commit SHA1
8495 describe: Delay looking up commits until searching for an inexact match
8498 git-send-email.perl: make initial In-Reply-To apply only to first email
8501 diffcore-pickaxe.c: a void function shouldn't try to return something
8502 Makefile: add NO_FNMATCH_CASEFOLD to IRIX sections
8503 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
8505 Brian Gernhardt (1):
8506 t6022: Use -eq not = to test output of wc -l
8508 Christopher Wilson (1):
8509 Enable highlight executable path as a configuration option
8511 Clemens Buchacher (6):
8512 t7607: use test-lib functions and check MERGE_HEAD
8513 t7607: add leading-path tests
8514 add function check_ok_to_remove()
8515 lstat_cache: optionally return match_len
8516 do not overwrite files in leading path
8517 use persistent memory for rejected paths
8520 mergetool-lib: combine vimdiff and gvimdiff run blocks
8521 mergetool-lib: add a three-way diff view for vim/gvim
8522 mergetool-lib: make the three-way diff the default for vim/gvim
8525 fast-import: Allow filemodify to set the root
8526 fast-import: insert new object entries at start of hash bucket
8527 fast-import: let importers retrieve blobs
8530 Document pre-condition for tree_entry_interesting
8531 tree-walk: Correct bitrotted comment about tree_entry()
8532 tree_entry_interesting(): Make return value more specific
8533 diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
8534 t3509: Add rename + D/F conflict testcase that recursive strategy fails
8535 merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
8536 t6032: Add a test checking for excessive output from merge
8537 t6022: Add test combinations of {content conflict?, D/F conflict remains?}
8538 t6022: Add tests for reversing order of merges when D/F conflicts present
8539 t6022: Add tests with both rename source & dest involved in D/F conflicts
8540 t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
8541 t6022: Add tests for rename/rename combined with D/F conflicts
8542 t6020: Modernize style a bit
8543 t6020: Add a testcase for modify/delete + directory/file conflict
8544 t6036: Test index and worktree state, not just that merge fails
8545 t6036: Add a second testcase similar to the first but with content changes
8546 t6036: Add testcase for undetected conflict
8547 merge-recursive: Small code clarification -- variable name and comments
8548 merge-recursive: Rename conflict_rename_rename*() for clarity
8549 merge-recursive: Nuke rename/directory conflict detection
8550 merge-recursive: Move rename/delete handling into dedicated function
8551 merge-recursive: Move delete/modify handling into dedicated function
8552 merge-recursive: Move process_entry's content merging into a function
8553 merge-recursive: New data structures for deferring of D/F conflicts
8554 merge-recursive: New function to assist resolving renames in-core only
8555 merge-recursive: Have process_entry() skip D/F or rename entries
8556 merge-recursive: Structure process_df_entry() to handle more cases
8557 merge-recursive: Update conflict_rename_rename_1to2() call signature
8558 merge-recursive: Update merge_content() call signature
8559 merge-recursive: Avoid doubly merging rename/add conflict contents
8560 merge-recursive: Move handling of double rename of one file to two
8561 merge-recursive: Move handling of double rename of one file to other file
8562 merge-recursive: Delay handling of rename/delete conflicts
8563 merge-recursive: Delay content merging for renames
8564 merge-recursive: Delay modify/delete conflicts if D/F conflict present
8565 conflict_rename_delete(): Check whether D/F conflicts are still present
8566 conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
8567 merge_content(): Check whether D/F conflicts are still present
8568 handle_delete_modify(): Check whether D/F conflicts are still present
8569 merge-recursive: Make room for directories in D/F conflicts
8570 merge-recursive: Remove redundant path clearing for D/F conflicts
8571 t4017 (diff-retval): replace manual exit code check with test_expect_code
8572 t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
8573 t4002 (diff-basic): use test_might_fail for commands that might fail
8574 t4202 (log): Replace '<git-command> || :' with test_might_fail
8575 t4019 (diff-wserror): add lots of missing &&
8576 t4026 (color): remove unneeded and unchained command
8577 t5602 (clone-remote-exec): add missing &&
8578 t6016 (rev-list-graph-simplify-history): add missing &&
8579 t7001 (mv): add missing &&
8580 t7601 (merge-pull-config): add missing &&
8581 t7800 (difftool): add missing &&
8582 Introduce sane_unset and use it to ensure proper && chaining
8585 Side-step sed line-ending "corruption" leading to t6038 failure.
8586 Side-step MSYS-specific path "corruption" leading to t5560 failure.
8587 Fix 'clone' failure at DOS root directory.
8588 Fix Windows-specific macro redefinition warning.
8589 Add MinGW-specific execv() override.
8591 Erik Faye-Lund (20):
8592 mingw: do not crash on open(NULL, ...)
8593 inet_ntop: fix a couple of old-style decls
8595 mingw: support waitpid with pid > 0 and WNOHANG
8596 mingw: add kill emulation
8597 daemon: use run-command api for async serving
8598 daemon: use full buffered mode for stderr
8599 daemon: get remote host address from root-process
8600 mingw: import poll-emulation from gnulib
8601 mingw: use poll-emulation from gnulib
8602 daemon: use socklen_t
8603 daemon: make --inetd and --detach incompatible
8604 daemon: opt-out on features that require posix
8605 msvc: opendir: fix malloc-failure
8606 msvc: opendir: allocate enough memory
8607 msvc: opendir: do not start the search
8608 win32: dirent: handle errors
8609 msvc: opendir: handle paths ending with a slash
8610 win32: use our own dirent.h
8611 help: always suggest common-cmds if prefix of cmd
8613 Giuseppe Bilotta (15):
8614 gitweb: use fullname as hash_base in heads link
8615 gitweb: introduce remote_heads feature
8616 gitweb: git_get_heads_list accepts an optional list of refs
8617 gitweb: separate heads and remotes lists
8618 gitweb: nagivation menu for tags, heads and remotes
8619 gitweb: allow action specialization in page header
8620 gitweb: remotes view for a single remote
8621 gitweb: refactor repository URL printing
8622 gitweb: provide a routine to display (sub)sections
8623 gitweb: group remote heads by remote
8624 git instaweb: enable remote_heads
8625 web--browse: coding style
8626 web--browse: split valid_tool list
8627 web--browse: support opera, seamonkey and elinks
8628 web--browse: better support for chromium
8631 Allow creation of arbitrary git-shell commands
8632 Add interactive mode to git-shell for user-friendliness
8633 Add sample commands for git-shell
8634 shell: Display errors from improperly-formatted command lines
8636 Ilari Liusvaara (4):
8637 Add bidirectional_transfer_loop()
8640 remote-fd/ext: finishing touches after code review
8642 Jakub Narębski (12):
8643 t/gitweb-lib.sh: Use GIT_BUILD_DIR
8644 t/gitweb-lib.sh: Use tabs for indent consistently
8645 gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
8646 t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
8647 gitweb/Makefile: Add 'test' and 'test-installed' targets
8648 gitweb/Makefile: Include gitweb/config.mak
8649 gitweb: Fix test of highlighting support in t9500
8650 gitweb: Fix bug in evaluate_path_info
8651 gitweb: Improve behavior for actionless path_info gitweb URLs
8652 gitweb: Time::HiRes is in core for Perl 5.8
8653 gitweb: selectable configurations that change with each request
8654 gitweb: Fix handling of whitespace in generated links
8657 read-tree: deprecate syntax without tree-ish args
8660 tests: factor out terminal handling from t7006
8661 tests: test terminal output to both stdout and stderr
8662 push: pass --progress down to git-pack-objects
8663 config: treat non-existent config files as empty
8664 diff: report bogus input to -C/-M/-B
8665 docs: clarify git diff modes of operation
8666 allow command-specific pagers in pager.<cmd>
8667 docs: default to more modern toolset
8668 default color.status.branch to "same as header"
8669 tests: add some script lint checks
8670 tests: flip executable bit on t9158
8671 handle arbitrary ints in git_config_maybe_bool
8672 t2107: mark passing test as success
8675 clone: Add the --recurse-submodules option as alias for --recursive
8676 fetch/pull: Add the --recurse-submodules option
8677 Add the 'fetch.recurseSubmodules' config setting
8678 Submodules: Add the "fetchRecurseSubmodules" config option
8679 git submodule: Remove now obsolete tests before cloning a repo
8682 git-send-email.perl: Add --to-cmd
8685 notes.c: Hexify SHA1 in die() message from init_notes()
8686 (trivial) notes.h: Minor documentation fixes to copy_notes()
8687 notes.h: Make default_notes_ref() available in notes API
8688 notes.c: Reorder functions in preparation for next commit
8689 notes.h/c: Allow combine_notes functions to remove notes
8690 notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
8691 (trivial) t3303: Indent with tabs instead of spaces for consistency
8692 notes.c: Use two newlines (instead of one) when concatenating notes
8693 builtin/notes.c: Split notes ref DWIMmery into a separate function
8694 git notes merge: Initial implementation handling trivial merges only
8695 builtin/notes.c: Refactor creation of notes commits.
8696 git notes merge: Handle real, non-conflicting notes merges
8697 git notes merge: Add automatic conflict resolvers (ours, theirs, union)
8698 Documentation: Preliminary docs on 'git notes merge'
8699 git notes merge: Manual conflict resolution, part 1/2
8700 git notes merge: Manual conflict resolution, part 2/2
8701 git notes merge: List conflicting notes in notes merge commit message
8702 git notes merge: --commit should fail if underlying notes ref has moved
8703 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
8704 git notes merge: Add testcases for merging notes trees at different fanouts
8705 Provide 'git notes get-ref' to easily retrieve current notes ref
8706 cmd_merge(): Parse options before checking MERGE_HEAD
8707 Provide 'git merge --abort' as a synonym to 'git reset --merge'
8709 Johannes Schindelin (1):
8710 merge-octopus: Work around environment issue on Windows
8713 t7300: add a missing SYMLINKS prerequisite
8714 apply --whitespace=fix: fix tab-in-indent
8715 Make the tab width used for whitespace checks configurable
8716 Avoid duplicate test number t7609
8718 Jonathan Nieder (52):
8719 merge-recursive: expose merge options for builtin merge
8720 ll-merge: replace flag argument with options struct
8721 commit-tree: free commit message before exiting
8722 test-lib: allow test code to check the list of declared prerequisites
8723 test_terminal: catch use without TTY prerequisite
8724 test_terminal: ensure redirections work reliably
8725 fast-import: filemodify after M 040000 <tree> "" crashes
8726 fast-import: tighten M 040000 syntax
8727 t9300 (fast-import): another test for the "replace root" feature
8728 fast-import: do not clear notes in do_change_note_fanout()
8729 user-manual: remote-tracking can be checked out, with detached HEAD
8730 tests: add missing &&
8731 tests: add missing &&, batch 2
8732 test-lib: introduce test_line_count to measure files
8733 t6022 (renaming merge): chain test commands with &&
8734 t1502 (rev-parse --parseopt): test exit code from "-h"
8735 t1400 (update-ref): use test_must_fail
8736 t3301 (notes): use test_expect_code for clarity
8737 t3404 (rebase -i): unroll test_commit loops
8738 t3404 (rebase -i): move comment to description
8739 t3404 (rebase -i): introduce helper to check position of HEAD
8740 t4124 (apply --whitespace): use test_might_fail
8741 wrapper: move xmmap() to sha1_file.c
8742 wrapper: move odb_* to environment.c
8743 path helpers: move git_mkstemp* to wrapper.c
8744 strbuf: move strbuf_branchname to sha1_name.c
8745 wrapper: give zlib wrappers their own translation unit
8746 pack-objects: mark file-local variable static
8747 Remove pack file handling dependency from wrapper.o
8748 Describe various forms of "be quiet" using OPT__QUIET
8749 fast-import: treat SIGUSR1 as a request to access objects early
8750 git-rev-parse.txt: clarify --git-dir
8751 gitweb: document $per_request_config better
8752 fast-import: stricter parsing of integer options
8753 fast-import: clarify documentation of "feature" command
8754 fast-import: Allow cat-blob requests at arbitrary points in stream
8755 git submodule -b ... of current HEAD fails
8756 Makefile: dependencies for vcs-svn tests
8757 parse-options: clearer reporting of API misuse
8758 parse-options: move NODASH sanity checks to parse_options_check
8759 parse-options: sanity check PARSE_OPT_NOARG flag
8760 parse-options: never suppress arghelp if LITERAL_ARGHELP is set
8761 parse-options: allow git commands to invent new option types
8762 parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
8763 update-index: migrate to parse-options API
8764 treap: make treap_insert return inserted node
8765 vcs-svn: fix intermittent repo_tree corruption
8766 Makefile: transport-helper uses thread-utils.h
8767 t9300: avoid short reads from dd
8768 bash: simple reimplementation of _get_comp_words_by_ref
8769 t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge
8770 t0001: test git init when run via an alias
8773 Add string comparison functions that respect the ignore_case variable.
8774 Case insensitivity support for .gitignore via core.ignorecase
8775 Add case insensitivity support for directories when using git status
8776 Add case insensitivity support when using git ls-files
8777 Support case folding for git add when core.ignorecase=true
8778 Support case folding in git fast-import when core.ignorecase=true
8780 Junio C Hamano (31):
8781 gitdiffcore doc: update pickaxe description
8782 diff: pass the entire diff-options to diffcore_pickaxe()
8783 git log/diff: add -G<regexp> that greps in the patch text
8784 diff/log -G<pattern>: tests
8785 grep: move logic to compile header pattern into a separate helper
8786 log --author: take union of multiple "author" requests
8787 disallow branch names that start with a hyphen
8789 merge-recursive: Restructure showing how to chain more process_* functions
8790 Martin Langhoff has a new e-mail address
8791 Make test script t9157 executable
8792 merge-recursive:make_room_for_directories - work around dumb compilers
8793 core.abbrevguard: Ensure short object names stay unique a bit longer
8794 read_sha1_file(): report correct name of packfile with a corrupt object
8795 A loose object is not corrupt if it cannot be read due to EMFILE
8796 t9001: send-email interation with --in-reply-to and --chain-reply-to
8797 t3404: do not use 'describe' to implement test_cmp_rev
8798 Update draft release notes to 1.7.4
8799 Update draft release notes to 1.7.4
8800 t9300: remove unnecessary use of /dev/stdin
8801 t9119: do not compare "Text Last Updated" line from "svn info"
8802 t9010 fails when no svn is available
8803 get_sha1: teach ":$n:<path>" the same relative path logic
8804 Documentation/git.txt: update list of maintenance releases
8805 fetch_populated_submodules(): document dynamic allocation
8806 thread-utils.h: simplify the inclusion
8807 Relnotes: remove items fixed on 'maint'
8808 get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable
8809 Update draft release notes to 1.7.4
8810 set_try_to_free_routine(NULL) means "do nothing special"
8814 merge-recursive --patience
8815 merge-recursive: options to ignore whitespace changes
8818 merge-recursive: option to specify rename threshold
8819 diff: add synonyms for -M, -C, -B
8820 completion: Support the DWIM mode for git checkout
8821 blame: Add option to show author email instead of name
8822 submodule: preserve all arguments exactly when recursing
8823 submodule: only preserve flags across recursive status/update invocations
8824 rebase: better rearranging of fixup!/squash! lines with --autosquash
8825 rebase: teach --autosquash to match on sha1 in addition to message
8826 diff: add --detect-copies-harder as a synonym for --find-copies-harder
8829 gitk: Show notes by default (like git log does)
8832 completion: make compatible with zsh
8833 completion: fix zsh check under bash with 'set -u'
8836 add support for the SUA layer (interix; windows)
8837 Interix: add configure checks
8840 Improve the mingw getaddrinfo stub to handle more use cases
8842 Martin von Zweigbergk (3):
8843 rebase: support --verify
8844 Use reflog in 'pull --rebase . foo'
8845 completion: add missing configuration variables
8848 Better "Changed but not updated" message in git-status
8849 Replace "remote tracking" with "remote-tracking"
8850 Change remote tracking to remote-tracking in non-trivial places
8851 everyday.txt: change "tracking branch" to "remote-tracking branch"
8852 Change "tracking branch" to "remote-tracking branch"
8853 Change incorrect uses of "remote branch" meaning "remote-tracking"
8854 Change incorrect "remote branch" to "remote tracking branch" in C code
8855 user-manual.txt: explain better the remote(-tracking) branch terms
8856 git-branch.txt: mention --set-upstream as a way to change upstream configuration
8858 Michael J Gruber (4):
8860 test: allow running the tests under "prove"
8861 t800?-blame.sh: retitle uniquely
8862 t1020-subdirectory: test alias expansion in a subdirectory
8865 mingw: add network-wrappers for daemon
8866 mingw: implement syslog
8867 compat: add inet_pton and inet_ntop prototypes
8869 Nguyễn Thái Ngọc Duy (64):
8870 branch -h: show usage even in an invalid repository
8871 checkout-index -h: show usage even in an invalid repository
8872 commit/status -h: show usage even with broken configuration
8873 gc -h: show usage even with broken configuration
8874 ls-files -h: show usage even with corrupt index
8875 merge -h: show usage even with corrupt index
8876 update-index -h: show usage even with corrupt index
8877 add: do not rely on dtype being NULL behavior
8878 get_cwd_relative(): do not misinterpret root path
8879 builtins: print setup info if repo is found
8880 Add t1510 and basic rules that run repo setup
8881 t1510: setup case #0
8882 t1510: setup case #1
8883 t1510: setup case #2
8884 t1510: setup case #3
8885 t1510: setup case #4
8886 t1510: setup case #5
8887 t1510: setup case #6
8888 t1510: setup case #7
8889 t1510: setup case #8
8890 t1510: setup case #9
8891 t1510: setup case #10
8892 t1510: setup case #11
8893 t1510: setup case #12
8894 t1510: setup case #13
8895 t1510: setup case #14
8896 t1510: setup case #15
8897 t1510: setup case #16
8898 t1510: setup case #17
8899 t1510: setup case #18
8900 t1510: setup case #19
8901 t1510: setup case #20
8902 t1510: setup case #21
8903 t1510: setup case #22
8904 t1510: setup case #23
8905 t1510: setup case #24
8906 t1510: setup case #25
8907 t1510: setup case #26
8908 t1510: setup case #27
8909 t1510: setup case #28
8910 t1510: setup case #29
8911 t1510: setup case #30
8912 t1510: setup case #31
8913 cache.h: realign and use (1 << x) form for CE_* constants
8914 dir.c: add free_excludes()
8915 unpack-trees: move all skip-worktree checks back to unpack_trees()
8916 unpack-trees: fix sparse checkout's "unable to match directories"
8917 Revert "excluded_1(): support exclude files in index"
8918 setup: save prefix (original cwd relative to toplevel) in startup_info
8919 Make prefix_path() return char* without const
8920 get_sha1: support relative path ":path" syntax
8921 get_sha1_oneline: make callers prepare the commit list to traverse
8922 get_sha1: support $commit^{/regex} syntax
8923 get_sha1: handle special case $commit^{/}
8924 Add git_config_early()
8925 Use git_config_early() instead of git_config() during repo setup
8926 setup: limit get_git_work_tree()'s to explicit setup case only
8927 setup: clean up setup_bare_git_dir()
8928 setup: clean up setup_discovered_git_dir()
8929 setup: rework setup_explicit_git_dir()
8930 Remove all logic from get_git_work_tree()
8931 Revert "Documentation: always respect core.worktree if set"
8932 git.txt: correct where --work-tree path is relative to
8933 setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
8936 Minor indentation fix.
8937 Remove @smtp_host_parts variable as not used.
8938 New send-email option smtpserveroption.
8941 commit: helper methods to reduce redundant blocks of code
8942 pretty.c: teach format_commit_message() to reencode the output
8943 commit: --fixup option for use with rebase --autosquash
8944 add tests of commit --fixup
8945 commit: --squash option for use with rebase --autosquash
8946 add tests of commit --squash
8949 MinGW: fix stat() and lstat() implementations for handling symlinks
8950 MinGW: Report errors when failing to launch the html browser.
8951 Skip t1300.70 and 71 on msysGit.
8952 Do not strip CR when grepping HTTP headers.
8953 Skip 'git archive --remote' test on msysGit
8954 git-am: fix detection of absolute paths for windows
8955 git-gui: show command-line errors in a messagebox on Windows
8956 git-gui: enable the Tk console when tracing/debugging on Windows
8957 git-gui: generic version trimming
8958 git-gui: use full dialog width for old name when renaming branch
8959 git-gui: correct assignment of work-tree
8960 git-gui: use wordprocessor tab style to ensure tabs work as expected
8961 git-gui: apply color information from git diff output
8964 gitk: Update Swedish translation (290t)
8966 Peter van der Does (1):
8967 bash: get --pretty=m<tab> completion to work with bash v4
8970 Add global and system-wide gitattributes
8973 commit.c: Remove backward goto in read_craft_line()
8975 Ramkumar Ramachandra (10):
8976 shell: Rewrite documentation and improve error message
8977 t4014-format-patch: Call test_tick before committing
8978 format-patch: Don't go over merge commits
8979 fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
8980 merge: Make '--log' an integer option for number of shortlog entries
8981 merge: Make 'merge.log' an integer or boolean option
8982 t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
8983 t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
8984 Porcelain scripts: Rewrite cryptic "needs update" error message
8985 t9010 (svn-fe): Eliminate dependency on svn perl bindings
8987 Ramsay Allan Jones (10):
8988 msvc: Fix compilation errors in compat/win32/sys/poll.c
8989 msvc: git-daemon.exe: Fix linker "unresolved externals" error
8990 msvc: Fix build by adding missing INTMAX_MAX define
8991 msvc: Fix macro redefinition warnings
8992 t3600-rm.sh: Don't pass a non-existent prereq to test #15
8993 t9142: Move call to start_httpd into the setup test
8994 lib-git-svn.sh: Avoid setting web server variables unnecessarily
8995 lib-git-svn.sh: Add check for mis-configured web server variables
8996 t9501-*.sh: Fix a test failure on Cygwin
8997 difftool: Fix failure on Cygwin
9000 add description parameter to OPT__VERBOSE
9001 add description parameter to OPT__DRY_RUN
9002 add description parameter to OPT__QUIET
9004 archive: improve --verbose description
9005 branch: improve --verbose description
9006 verify-tag: document --verbose
9009 bisect: improve error message of 'bisect log' while not bisecting
9010 bisect: improve error msg of 'bisect reset' when original HEAD is deleted
9011 bisect: check for mandatory argument of 'bisect replay'
9012 bash: offer refs for 'git bisect start'
9013 bash: not all 'git bisect' subcommands make sense when not bisecting
9014 bash: support more 'git notes' subcommands and their options
9015 bash: support pretty format aliases
9018 parse-remote: handle detached HEAD
9021 t3030: Add a testcase for resolvable rename/add conflict with symlinks
9023 Sebastian Schuberth (3):
9024 MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility
9025 MinGW: Add missing file mode bit defines
9026 On Windows, avoid git-gui to call Cygwin's nice utility
9028 Shawn O. Pearce (2):
9029 Use git_open_noatime when accessing pack data
9030 Work around EMFILE when there are too many pack files
9033 gitk: Prevent the text pane from becoming editable
9034 gitk: Make text selectable on Mac
9037 send-email: Use To: headers in patch files
9038 send-email: Don't leak To: headers between patches
9039 parse-options: Don't call parse_options_check() so much
9040 parse-options: do not infer PARSE_OPT_NOARG from option type
9043 git-svn: allow the mergeinfo property to be set
9046 contrib/ciabot: git-describe commit instead of HEAD
9049 t5523-push-upstream: add function to ensure fresh upstream repo
9050 t5523-push-upstream: test progress messages
9051 format-patch: page output with --stdout
9052 bash completion: add basic support for git-reflog
9055 commit: Add commit_list prefix in two function names.
9056 builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
9057 builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc.
9060 {cvs,svn}import: use the new 'git read-tree --empty'
9061 t0003: properly quote $HOME
9062 gitk: Add the equivalent of diff --color-words
9064 Torsten Bögershausen (1):
9065 t9143: do not fail when unhandled.log.gz is not created
9068 diff: use "find" instead of "detect" as prefix for long forms of -M and -C
9070 Ævar Arnfjörð Bjarmason (22):
9071 send-email: use catfile() to concatenate files
9072 send-email: use lexical filehandle for opendir
9073 send-email: use lexical filehandles for $compose
9074 send-email: use lexical filehandles during sending
9075 send-email: get_patch_subject doesn't need a prototype
9076 send-email: file_declares_8bit_cte doesn't need a prototype
9077 send-email: unique_email_list doesn't need a prototype
9078 send-email: cleanup_compose_files doesn't need a prototype
9079 send-email: use \E***\Q instead of \*\*\*
9080 send-email: sanitize_address use $foo, not "$foo"
9081 send-email: sanitize_address use qq["foo"], not "\"foo\""
9082 send-email: use (?:) instead of () if no match variables are needed
9083 send-email: send_message die on $!, not $?
9084 send-email: make_message_id use "require" instead of "use"
9085 send-email: use Perl idioms in while loop
9086 send-email: is_rfc2047_quoted use qr// regexes
9087 send-email: extract_valid_address use qr// regexes
9088 Makefile & configure: add a NO_FNMATCH flag
9089 Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
9090 test-lib: make test_expect_code a test command
9091 t7004-tag.sh: re-arrange git tag comment for clarity
9092 tests: use test_cmp instead of piping to diff(1)
9095 CodingGuidelines: Add a section on writing documentation
9096 diff,difftool: Don't use the {0,2} notation in usage strings
9099 Version v1.7.3.5; changes since v1.7.3.4:
9100 -----------------------------------------
9103 test-lib.sh/test_decode_color(): use octal not hex in awk script
9106 gitweb: Include links to feeds in HTML header only for '200 OK' response
9109 ident: die on bogus date format
9112 Fix typo in git-gc document.
9114 Jonathan Nieder (2):
9115 t0050: fix printf format strings for portability
9116 gitweb: skip logo in atom feed when there is none
9119 commit: die before asking to edit the log message
9120 am --abort: keep unrelated commits since the last failure and warn
9121 rebase --skip: correctly wrap-up when skipping the last patch
9126 status: Quote paths with spaces in short format
9129 t/t8006: Demonstrate blame is broken when cachetextconv is on
9130 fill_textconv(): Don't get/put cache if sha1 is not valid
9133 fsck docs: remove outdated and useless diagnostic
9135 Michael J Gruber (2):
9136 git-difftool.txt: correct the description of $BASE and describe $MERGED
9137 difftool: provide basename to external tools
9139 Ramsay Allan Jones (1):
9140 t3419-*.sh: Fix arithmetic expansion syntax error
9143 close file on error in read_mmfile()
9145 Robin H. Johnson (2):
9146 Fix false positives in t3404 due to SHELL=/bin/false
9147 t9001: Fix test prerequisites
9150 userdiff: fix typo in ruby and python word regexes
9152 Vasyl' Vavrychuk (1):
9153 trace.c: mark file-local function static
9156 Version v1.7.3.4; changes since v1.7.3.3:
9157 -----------------------------------------
9160 contrib/hooks/post-receive-email: fix return values from prep_for_email
9162 Alejandro R. Sedeño (1):
9163 Add --force to git-send-email documentation
9166 apply: Recognize epoch timestamps with : in the timezone
9168 Christoph Mallon (1):
9169 diff --check: correct line numbers of new blank lines at EOF
9171 Clemens Buchacher (6):
9172 t7607: use test-lib functions and check MERGE_HEAD
9173 t7607: add leading-path tests
9174 add function check_ok_to_remove()
9175 lstat_cache: optionally return match_len
9176 do not overwrite files in leading path
9177 use persistent memory for rejected paths
9179 Federico Cuello (1):
9180 Fix git-apply with -p greater than 1
9183 t5550: test HTTP authentication and userinfo decoding
9184 Fix username and password extraction from HTTP URLs
9187 gitweb: Introduce esc_attr to escape attributes of HTML elements
9190 git-pull.txt: Mention branch.autosetuprebase
9193 log.decorate: accept 0/1 bool values
9194 reflogs: clear flags properly in corner case
9196 Jonathan "Duke" Leto (1):
9197 Correct help blurb in checkout -p and friends
9199 Jonathan Nieder (4):
9200 apply: handle patches with funny filename and colon in timezone
9201 cherry-pick/revert: transparently refresh index
9202 Documentation: split gitignore page into sections
9203 Documentation: point to related commands from gitignore
9206 test: git-apply -p2 rename/chmod only
9207 Do not link with -lcrypto under NO_OPENSSL
9213 setup: make sure git_dir path is in a permanent buffer, getenv(3) case
9215 Martin von Zweigbergk (2):
9216 rebase --abort: do not update branch ref
9217 rebase: only show stat if configured to true
9219 Michael J Gruber (6):
9220 t/t7004-tag: test handling of rfc1991 signatures
9221 verify-tag: factor out signature detection
9222 tag: factor out sig detection for body edits
9223 tag: factor out sig detection for tag display
9224 tag: recognize rfc1991 signatures
9225 git-rm.txt: Fix quoting
9227 Nguyễn Thái Ngọc Duy (1):
9228 entry.c: remove "checkout-index" from error messages
9231 diff: don't presume empty file when corresponding object is missing
9232 make pack-objects a bit more resilient to repo corruption
9235 smart-http: Don't change POST to GET when following redirect
9236 t5550-http-fetch: add missing '&&'
9237 t5550-http-fetch: add test for http-fetch
9238 shift end_url_with_slash() from http.[ch] to url.[ch]
9239 url: add str wrapper for end_url_with_slash()
9240 http-backend: use end_url_with_slash()
9241 http-push: Normalise directory names when pushing to some WebDAV servers
9242 http-push: check path length before using it
9243 http-push: add trailing slash at arg-parse time, instead of later on
9244 http-fetch: rework url handling
9246 Ævar Arnfjörð Bjarmason (2):
9247 perl: bump the required Perl version to 5.8 from 5.6.[21]
9248 perl: use "use warnings" instead of -w
9251 Version v1.7.3.3; changes since v1.7.3.2:
9252 -----------------------------------------
9255 submodule sync: Update "submodule.<name>.url" for empty directories
9258 Fix handling of git-p4 on deleted files
9261 userdiff.c: add builtin fortran regex patterns
9262 builtin/revert.c: don't dereference a NULL pointer
9264 Brian Gernhardt (1):
9265 t/gitweb-lib: Don't pass constant to decode_utf8
9267 Clemens Buchacher (3):
9268 add rebase patch id tests
9269 do not search functions for patch ID
9270 do not overwrite untracked during merge from unborn branch
9273 git-blame.el: Add (require 'format-spec)
9275 Diego Elio Pettenò (1):
9276 imap-send: link against libcrypto for HMAC and others
9279 mingw: do not set errno to 0 on success
9281 Giuseppe Bilotta (1):
9282 CodingGuidelines: mention whitespace preferences for shell scripts
9285 repack: add -F flag to let user choose between --no-reuse-delta/object
9286 Documentation: pack.compression: explain how to recompress
9289 git-commit.txt: (synopsis): move -i and -o before "--"
9292 diff: don't use pathname-based diff drivers for symlinks
9293 rev-list: handle %x00 NUL in user format
9294 docs: give more hints about how "add -e" works
9295 apply: don't segfault on binary files with missing data
9296 docs: give more hints about how "add -e" works
9297 document sigchain api
9300 pull: Remove --tags option from manpage
9303 mailmap: fix use of freed memory
9306 git-send-email.perl: Deduplicate "to:" and "cc:" entries with names
9308 Jonathan Nieder (5):
9309 t4203 (mailmap): stop hardcoding commit ids and dates
9310 send-pack: avoid redundant "pack-objects died with strange error"
9311 Documentation: document show -s
9312 add: introduce add.ignoreerrors synonym for add.ignore-errors
9313 Documentation: do not misinterpret pull refspec as bold text
9316 t4203: do not let "git shortlog" DWIM based on tty
9317 t3402: test "rebase -s<strategy> -X<opt>"
9318 Documentation: Fix mark-up of lines with more than one tilde
9323 test-lib: extend test_decode_color to handle more color codes
9324 diff: handle lines containing only whitespace and tabs better
9326 Kevin P. Fleming (1):
9327 post-receive-email: ensure sent messages are not empty
9330 blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
9331 blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
9332 blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
9334 Martin von Zweigbergk (2):
9335 rebase -X: do not clobber strategy
9336 Documentation/git-pull: clarify configuration
9338 Michael J Gruber (6):
9339 git-reset.txt: clarify branch vs. branch head
9340 git-reset.txt: reset does not change files in target
9341 git-reset.txt: reset --soft is not a no-op
9342 git-reset.txt: use "working tree" consistently
9343 git-reset.txt: point to git-checkout
9344 git-reset.txt: make modes description more consistent
9346 Nathan W. Panike (1):
9347 Fix a formatting error in git-merge.txt
9349 Nguyễn Thái Ngọc Duy (3):
9350 dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout
9351 clean: avoid quoting twice
9352 clean: remove redundant variable baselen
9355 diff: avoid repeated scanning while looking for funcname
9358 send-email: Refuse to send cover-letter template subject
9359 prefix_filename(): safely handle the case where pfx_len=0
9360 merge-file: correctly find files when called in subdir
9361 repack: place temporary packs under .git/objects/pack/
9363 Uwe Kleine-König (1):
9364 get_author_ident_from_commit(): remove useless quoting
9367 Fix copy-pasted comments related to tree diff handling.
9368 Keep together options controlling the behaviour of diffcore-rename.
9369 Document that rev-list --graph triggers parent rewriting.
9372 bash: Match lightweight tags in prompt
9374 Ævar Arnfjörð Bjarmason (1):
9375 Makefile: add CC to TRACK_CFLAGS
9378 Version v1.7.3.2; changes since v1.7.3.1:
9379 -----------------------------------------
9381 Andreas Gruenbacher (1):
9382 Clarify and extend the "git diff" format documentation
9385 t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
9388 Documentation: update-index: -z applies also to --index-info
9391 diffcore-pickaxe.c: remove unnecessary curly braces
9394 documentation: git-config minor cleanups
9397 t3020 (ls-files-error-unmatch): remove stray '1' from end of file
9400 Documentation/git-svn: discourage "noMetadata"
9403 do not depend on signed integer overflow
9405 Johannes Schindelin (2):
9406 Make sure that git_getpass() never returns NULL
9407 Fix typo in pack-objects' usage
9410 stash: simplify parsing fixes
9412 Jonathan Nieder (10):
9413 t0004 (unwritable files): simplify error handling
9414 environment.c: remove unused variable
9415 setup: make sure git dir path is in a permanent buffer
9416 init: plug tiny one-time memory leak
9417 xdiff: cast arguments for ctype functions to unsigned char
9418 Documentation: No argument of ALLOC_GROW should have side-effects
9419 Documentation: gitrevisions is in section 7
9420 Documentation: diff can compare blobs
9421 Documentation: expand 'git diff' SEE ALSO section
9422 Documentation: update implicit "--no-index" behavior in "git diff"
9425 MinGW: avoid collisions between "tags" and "TAGS"
9426 CodingGuidelines: reword parameter expansion section
9427 shell portability: no "export VAR=VAL"
9431 Update test script annotate-tests.sh to handle missing/extra authors
9434 user-manual: be consistent in illustrations to 'git rebase'
9436 Mathias Lafeldt (1):
9437 git-svn: fix processing of decorated commit hashes
9440 diff: trivial fix for --output file error message
9442 Michael J Gruber (4):
9443 remote-helpers: build in platform independent directory
9444 user-manual: fix anchor name Finding-comments-With-given-Content
9445 rev-list-options: clarify --parents and --children
9446 git-show-ref.txt: clarify the pattern matching
9448 Ramkumar Ramachandra (1):
9449 SubmittingPatches: Document some extra tags used in commit messages
9452 work around buggy S_ISxxx(m) implementations
9455 git-svn: check_cherry_pick should exclude commits already in our history
9458 Better advice on using topic branches for kernel development
9460 Uwe Kleine-König (1):
9461 Documentation/git-clone: describe --mirror more verbosely
9464 t/t3415: use && where applicable.
9467 Use angles for placeholders consistently
9468 Fix odd markup in --diff-filter documentation
9469 Use parentheses and `...' where appropriate
9470 Remove stray quotes in --pretty and --format documentation
9471 Put a space between `<' and argument in pack-objects usage string
9472 Fix {update,checkout}-index usage strings
9475 Version v1.7.3.1; changes since v1.7.3:
9476 ---------------------------------------
9479 t/t3903-stash: improve testing of git-stash show
9480 wt-status.c: don't leak directory entries when processing untracked,ignored
9481 git-send-email.perl: ensure $domain is defined before using it
9483 Brian Gernhardt (1):
9484 git-stash: fix flag parsing
9486 Christian Couder (1):
9487 t6050 (replace): fix bogus "fetch branch with replacement" test
9489 Daniel Knittl-Frank (1):
9490 Improvements to `git checkout -h`
9493 prefer test -h over test -L in shell scripts
9496 stash: fix git stash branch regression when branch creation fails
9499 CodingGuidelines: spell Arithmetic Expansion with $(($var))
9503 Fix missing 'does' in man-page for 'git checkout'
9506 update comment and documentation for :/foo syntax
9508 Michael J Gruber (1):
9509 contrib/completion: --no-index option to git diff
9512 strbuf.h: fix comment typo
9513 dir.c: squelch false uninitialized memory warning
9515 Ramsay Allan Jones (1):
9516 t1503: Fix arithmetic expansion syntax error when using dash
9519 stash drops the stash even if creating the branch fails because it already exists
9521 Wesley J. Landaker (1):
9522 Documentation: Refer to git-commit-tree in git-filter-branch help
9525 Version v1.7.3; changes since v1.7.3-rc2:
9526 -----------------------------------------
9529 t/t7300: workaround ancient touch by rearranging arguments
9531 Brian Gernhardt (1):
9532 t7003: Use test_commit instead of custom function
9535 git-rebase--interactive.sh: replace cut with ${v%% *}
9538 git-ls-files.txt: clarify -x/--exclude option
9541 ls-files documentation: reword for consistency
9545 Version v1.7.3-rc2; changes since v1.7.3-rc1:
9546 ---------------------------------------------
9549 bundle: detect if bundle file cannot be created
9550 filter-branch: retire --remap-to-ancestor
9553 Several tests: cd inside subshell instead of around
9554 t1020: Get rid of 'cd "$HERE"' at the start of each test
9556 Jonathan Nieder (5):
9557 tests: subshell indentation stylefix
9558 t1450 (fsck): remove dangling objects
9559 t2105 (gitfile): add missing &&
9560 t1302 (core.repositoryversion): style tweaks
9561 t2016 (checkout -p): add missing &&
9564 t3101: modernise style
9565 ls-tree $di $dir: do not mistakenly recurse into directories
9569 git-gui: use shell to launch textconv filter in "blame"
9572 Add --src/dst-prefix to git-formt-patch in git-rebase.sh
9575 git-gui: Make usage statement visible on Windows.
9576 git-gui: display error launching blame as a message box.
9577 git-gui: handle textconv filter on Windows and in development
9578 git-gui: ensure correct application termination in git-gui--askpass
9579 git-gui: avoid mis-encoding the copyright message on Windows.
9583 git-gui: Update Swedish translation (521t).
9585 Ramsay Allan Jones (1):
9586 vcs-svn: Fix some printf format compiler warnings
9589 compat/nedmalloc: don't force NDEBUG on the rest of git
9592 RE: [PATCH] Avoid rename/add conflict when contents are identical
9595 Version v1.7.3-rc1; changes since v1.7.3-rc0:
9596 ---------------------------------------------
9599 Add a new option 'core.askpass'.
9602 t/t5510: demonstrate failure to fetch when current branch has merge ref
9603 builtin/fetch.c: ignore merge config when not fetching from branch's remote
9604 t/t7008: workaround broken handling of \000 by printf on IRIX
9605 Makefile: use compat regex on IRIX 6.5
9606 builtin/fetch.c: comment that branch->remote_name is usable when has_merge
9607 t/t5510-fetch.sh: improve testing with explicit URL and merge spec
9608 diff.c: call regfree to free memory allocated by regcomp when necessary
9609 xdiff-interface.c: always trim trailing space from xfuncname matches
9610 t/t4018: test whether the word_regex patterns compile
9611 t/t4018: avoid two unnecessary sub-shell invocations
9614 cache_tree_free: Fix small memory leak
9615 revert: Fix trivial comment style issue
9618 pass "git -c foo=bar" params through environment
9619 tests: make test_must_fail more verbose
9620 tests: make test_must_fail fail on missing commands
9623 t3404 & t7508: cd inside subshell instead of around
9626 notes: Don't create (empty) commit when removing non-existing notes
9629 fast-export: ensure that a renamed file is printed after all references
9631 Jonathan Nieder (3):
9632 do not pass "git -c foo=bar" params to transport helpers
9633 tests: make test_might_fail more verbose
9634 tests: make test_might_fail fail on missing commands
9637 install-webdoc: keep installed RelNotes-*.txt
9638 Prepare for 1.7.3 rc1
9642 Allow core.askpass to override SSH_ASKPASS.
9643 Extend documentation of core.askpass and GIT_ASKPASS.
9646 config.txt: fix placement of diff.noprefix
9649 Documentation: move RelNotes into a directory of their own
9652 builtin.h: Move two functions definitions to help.h.
9653 builtin/clean.c: Use STRING_LIST_INIT_NODUP.
9656 Version v1.7.3-rc0; changes since v1.7.2.5:
9657 -------------------------------------------
9659 Alejandro R. Sedeño (1):
9660 gitweb: move highlight config out of guess_file_syntax()
9663 Add a for_each_string_list_item macro
9664 Convert the users of for_each_string_list to for_each_string_list_item macro
9666 Alexander Gladysh (1):
9667 Add a rename + D/F conflict testcase
9670 gitweb: Don't die_error in git_tag after already printing headers
9673 git-rebase--interactive.sh: rework skip_unnecessary_picks
9674 git-rebase--interactive.sh: use printf instead of echo to print commit message
9676 Brian Gernhardt (2):
9677 t7610: cd inside subshell instead of around
9678 t7606: Avoid using head as a file name
9681 mergetool: Remove explicit references to /dev/tty
9683 Christian Couder (11):
9684 revert: report success when using option --strategy
9685 revert: refactor commit code into a new run_git_commit() function
9686 revert: don't print "Finished one cherry-pick." if commit failed
9687 revert: improve success message by adding abbreviated commit sha1
9688 t3508: add check_head_differs_from() helper function and use it
9689 revert: fix off by one read when searching the end of a commit subject
9690 revert: refactor code to find commit subject in find_commit_subject()
9691 revert: rename variables related to subject in get_message()
9692 bisect: use find_commit_subject() instead of custom code
9693 merge-recursive: use find_commit_subject() instead of custom code
9694 blame: use find_commit_subject() instead of custom code
9696 Clemens Buchacher (1):
9697 hash binary sha1 into patch id
9700 mergetool: Skip autoresolved paths
9703 Add memory pool library
9704 Add string-specific memory pool
9705 Add stream helper library
9706 Infrastructure to write revisions in fast-export format
9709 David D. Kilzer (3):
9710 git svn: fix dcommit to work with touched files
9711 git-svn: fix regex to remove "tail" from svn tags
9712 git-svn: fix fetch with deleted tag
9715 merge-recursive: porcelain messages for checkout
9716 t7609: test merge and checkout error messages
9718 Dmitry Statyvka (1):
9719 git svn: add an option to recode pathnames
9722 Add additional testcases for D/F conflicts
9723 merge-recursive: Fix D/F conflicts
9724 merge_recursive: Fix renames across paths below D/F conflicts
9725 fast-export: Fix output order of D/F changes
9726 fast-import: Improve robustness when D->F changes provided in wrong order
9727 fast-export: Fix dropping of files with --import-marks and path limiting
9728 fast-export: Add a --full-tree option
9729 upload-pack: Improve error message when bad ref requested
9730 Mark tests that use symlinks as needing SYMLINKS prerequisite
9731 merge-recursive: Fix typo
9732 t6031: Add a testcase covering multiple renames across a D/F conflict
9733 merge-recursive: Fix multiple file rename across D/F conflict
9734 merge-recursive: Avoid excessive output for and reprocessing of renames
9737 instaweb: fix WEBrick server support
9738 instaweb: minimize moving parts for WEBrick
9739 instaweb: add access+error logging for WEBrick
9740 t9155: fix compatibility with older SVN
9742 Eyvind Bernhardsen (3):
9743 Avoid conflicts when merging branches with mixed normalization
9744 Try normalizing files to avoid delete/modify conflicts when merging
9745 Don't expand CRLFs when normalizing text during merge
9748 Change regerror() declaration from K&R style to ANSI C (C89)
9751 split_cmdline: Allow caller to access error string
9754 Teach ref iteration module about submodules
9755 setup_revisions(): Allow walking history in a submodule
9756 Implement automatic fast-forward merge for submodules
9757 add configuration variable for --autosquash option of interactive rebase
9760 gitweb: Fix typo in run() subroutine
9763 Convert "! git" to "test_must_fail git"
9764 Add -e/--exclude to git-clean.
9765 Add test for git clean -e.
9766 builtin/push.c: remove useless temporary variable
9767 Document git-instaweb start/stop/restart
9770 Add treap implementation
9773 docs: fix Makefile dependency for user manual
9776 Submodules: Add the new "ignore" config option for diff and status
9777 Submodules: Use "ignore" settings from .gitmodules too for diff and status
9778 Add tests for the diff.ignoreSubmodules config option
9779 checkout: Add test for diff.ignoreSubmodules
9780 checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
9781 t7405: cd inside subshell instead of around
9782 t7406 & t7407: add missing && at end of lines
9785 Make graph_next_line() available in the graph.h API
9786 Enable custom schemes for column colors in the graph API
9788 Johannes Schindelin (2):
9789 Add the 'diff.ignoreSubmodules' config setting
9790 checkout: respect diff.ignoreSubmodules setting
9793 Fix compat/regex ANSIfication on MinGW
9796 detached-stash: introduce parse_flags_and_revs function
9797 detached-stash: work around git rev-parse failure to detect bad log refs
9798 detached-stash: simplify stash_apply
9799 detached-stash: simplify stash_drop
9800 detached-stash: refactor git stash pop implementation
9801 detached-stash: simplify git stash branch
9802 detached-stash: simplify git stash show
9803 detached-stash: tests of git stash with stash-like arguments
9804 detached-stash: update Documentation
9805 rev-parse: exit with non-zero status if ref@{n} is not valid.
9806 sha1_name.c: use warning in preference to fprintf(stderr
9807 rev-parse: tests git rev-parse --verify master@{n}, for various n
9808 t1503: fix broken test_must_fail calls
9809 t3903: fix broken test_must_fail calls
9811 Jonathan Nieder (89):
9812 Teach fast-import to import subtrees named by tree id
9813 Export parse_date_basic() to convert a date string to timestamp
9814 t1501 (rev-parse): clarify
9815 tests: try git apply from subdir of toplevel
9816 setup: split off $GIT_DIR-set case from setup_git_directory_gently
9817 setup: split off a function to checks working dir for .git file
9818 setup: split off code to handle stumbling upon a repository
9819 setup: split off a function to handle hitting ceiling in repo search
9820 setup: split off get_device_or_die helper
9821 t1011 (sparse checkout): style nitpicks
9822 gitweb: allow configurations that change with each request
9823 t4111 (apply): refresh index before applying patches to it
9824 diff: split off a function for --stat-* option parsing
9825 t6038 (merge.renormalize): style nitpicks
9826 t6038 (merge.renormalize): try checkout -m and cherry-pick
9827 t6038 (merge.renormalize): check that it can be turned off
9828 merge-trees: push choice to renormalize away from low level
9829 merge-trees: let caller decide whether to renormalize
9830 Documentation/technical: document ll_merge
9831 ll-merge: make flag easier to populate
9832 ll-merge: let caller decide whether to renormalize
9833 t4200 (rerere): modernize style
9834 rerere: migrate to parse-options API
9835 rerere: never renormalize
9836 merge-recursive --renormalize
9837 Introduce vcs-svn lib
9838 Update svn-fe manual
9839 svn-fe manual: Clarify warning about deltas in dump files
9840 vcs-svn: remove build artifacts on "make clean"
9842 compat: add strtok_r()
9843 vcs-svn: Rename dirent pool to build on Windows
9844 vcs-svn: Avoid %z in format string
9845 t9010 (svn-fe): use Unix-style path in URI
9846 t9010 (svn-fe): avoid symlinks in test
9847 Eliminate “Finished cherry-pick/revert” message
9848 Introduce advise() to print hints
9849 cherry-pick/revert: Use error() for failure message
9850 cherry-pick/revert: Use advise() for hints
9851 t7606 (merge-theirs): modernize style
9852 merge: let custom strategies intervene in trivial merges
9853 t7006 (pager): add missing TTY prerequisites
9854 merge: do not mistake (ancestor of) tag for branch
9855 t7600 (merge): modernize style
9856 t7600 (merge): do not launch gitk for --debug
9857 t7600 (merge): check reflog entry
9858 t7600 (merge): test merge from branch yet to be born
9859 t6010 (merge-base): modernize style
9860 t6200 (fmt-merge-msg): style nitpicks
9861 Documentation: add a SEE ALSO section for merge-base
9862 merge-base --octopus to mimic show-branch --merge-base
9863 merge-base --independent to print reduced parent list in a merge
9864 fmt-merge-msg -m to override merge title
9865 merge script: --squash, --ff from unborn branch are errors
9866 merge script: tweak unmerged files message to match builtin
9867 merge script: refuse to merge during merge
9868 merge script: improve log message subject
9869 merge script: merge -X<option>
9870 merge script: allow custom strategies
9871 merge script: forbid merge -s index
9872 merge script: handle -m --log correctly
9873 merge script: handle many-way octopus
9874 merge script: --ff-only to disallow true merge
9875 merge script: handle --no-ff --no-commit correctly
9876 merge script: notice @{-1} shorthand
9877 merge script: learn --[no-]rerere-autoupdate
9878 autoconf: don't use platform regex if it lacks REG_STARTEND
9879 Documentation: set a !DOCTYPE for user manual
9880 Documentation: tweak description of log.date
9881 Documentation: quoting trouble in "git rm" discussion
9882 Documentation: unbreak regex in show-ref manual
9883 Documentation: clarify quoting in "git add" example
9884 Documentation: add missing quotes to "git grep" examples
9885 Documentation: clarify quoting in "git rm" example
9886 Documentation: clarify quoting in gitignore docs
9887 Documentation: remove backslashes in manpage synopses
9888 Documentation/technical: avoid stray backslash in parse-options API docs
9889 Documentation: remove stray backslash from "git bundle" manual
9890 Documentation: remove backslash before ~ in fast-import manual
9891 Documentation: remove stray backslashes in rev-parse manual
9892 Documentation: avoid stray backslashes in core tutorial
9893 Documentation: avoid stray backslash in user manual
9894 Documentation: do not convert ... operator to ellipses
9895 Documentation: remove stray backslashes from "Fighting regressions" article
9896 Documentation: remove stray backslash in show-branch discussion
9897 apply: split quoted filename handling into new function
9898 tests: exercise "git apply" with weird filenames
9899 apply: handle traditional patches with space in filename
9900 tests: simplify "missing PREREQ" message
9903 cvs tests: do not touch test CVS repositories shipped with source
9904 compat/regex: get rid of old-style definition
9905 autoconf: regex library detection typofix
9906 Work around em-dash handling in newer AsciiDoc
9907 install-webdoc: filter timestamp-only changes correctly
9910 Kevin P. Fleming (1):
9911 post-receive-email: optional message line count limit
9914 diff: parse separate options like -S foo
9915 diff: parse separate options --stat-width n, --stat-name-width n
9916 log: parse separate options like git log --grep foo
9917 log: parse separate option for --glob
9918 rebase -i: add exec command to launch a shell command
9919 test-lib: user-friendly alternatives to test [-d|-f|-e]
9920 Turn unpack_trees_options.msgs into an array + enum
9921 merge-recursive: distinguish "removed" and "overwritten" messages
9922 unpack_trees: group error messages by type
9923 tests: factor HOME=$(pwd) in test-lib.sh
9924 Move set_porcelain_error_msgs to unpack-trees.c and rename it
9925 setup_unpack_trees_porcelain: take the whole options struct as parameter
9926 Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
9927 t7609-merge-co-error-msgs: test non-fast forward case too.
9929 Michael J Gruber (3):
9930 git-bundle.txt: Cleanup
9931 git-bundle.txt: whitespace cleanup
9932 git-bundle.txt: Clarify rev-list-args restrictions
9935 rebase: support -X to pass through strategy options
9937 Nguyễn Thái Ngọc Duy (22):
9938 upload-pack: remove unused "create_full_pack" code in do_rev_list
9939 setup: do not forget working dir from subdir of gitdir
9940 Revert "rehabilitate 'git index-pack' inside the object store"
9941 setup: split off a function to handle ordinary .git directories
9942 unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
9943 unpack-trees: let read-tree -u remove index entries outside sparse area
9944 unpack-trees: do not check for conflict entries too early
9945 unpack-trees: mark new entries skip-worktree appropriately
9946 git wrapper: introduce startup_info struct
9947 setup: remember whether repository was found
9948 git wrapper: allow setup_git_directory_gently() be called earlier
9949 shortlog: run setup_git_directory_gently() sooner
9950 grep: run setup_git_directory_gently() sooner
9951 apply: run setup_git_directory_gently() sooner
9952 bundle: run setup_git_directory_gently() sooner
9953 config: run setup_git_directory_gently() sooner
9954 index-pack: run setup_git_directory_gently() sooner
9955 ls-remote: run setup_git_directory_gently() sooner
9956 var: run setup_git_directory_gently() sooner
9957 merge-file: run setup_git_directory_gently() sooner
9958 clone: warn users --depth is ignored in local clones
9959 parse_object: pass on the original sha1, not the replaced one
9962 Userdiff patterns for C#
9964 Ralf Wildenhues (1):
9965 Typos in code comments, an error message, documentation
9967 Ramkumar Ramachandra (1):
9968 builtin/checkout: Fix message when switching to an existing branch
9970 Spencer E. Olson (1):
9971 Allow HTTP user agent string to be modified.
9974 git svn: URL-decode left-hand side of svn refspec
9976 Sverre Rabbelier (1):
9977 config: add --local option
9980 add tests for checkout -b
9981 builtin/checkout: reword hint for -b
9982 builtin/checkout: learn -B
9983 builtin/checkout: handle -B from detached HEAD correctly
9986 string_list: Add STRING_LIST_INIT macro and make use of it.
9987 object.h: Add OBJECT_ARRAY_INIT macro and make use of it.
9990 Do not unquote + into ' ' in URLs
9991 ls-files: learn a debugging dump format
9992 Makefile: make gcov invocation configurable
9993 test: Introduce $GIT_BUILD_DIR
9995 Ævar Arnfjörð Bjarmason (59):
9996 sha1_file: Show the the type and path to corrupt objects
9997 tests: Ignore the Test::Harness .prove file
9998 t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
9999 SubmittingPatches: Clarify the Signed-off-by rules
10000 SubmittingPatches: Cite the 50 char subject limit
10001 perl/Makefile: Unset INSTALL_BASE when making perl.mak
10002 test-lib: Don't write test-results when HARNESS_ACTIVE
10003 test-lib: Add support for multiple test prerequisites
10004 test-lib: Print missing prerequisites in test output
10005 t/README: Document the predefined test prerequisites
10006 tests: A SANITY test prereq for testing if we're root
10007 test-lib: Multi-prereq support only checked the last prereq
10008 tests: Infrastructure for Git smoke testing
10009 t/README: Document the Smoke testing
10010 t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh
10011 t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target
10012 gitignore: Ignore files generated by "make coverage"
10013 Makefile: Include subdirectories in "make cover" reports
10014 Makefile: Split out the untested functions target
10015 Makefile: Add cover_db target
10016 Makefile: Add cover_db_html target
10017 t/README: A new section about test coverage
10018 t/README: Add a note about the dangers of coverage chasing
10019 tests: implicitly skip SYMLINKS tests using <prereq>
10020 t/t4004-diff-rename-symlink.sh: use three-arg <prereq>
10021 t/t5800-remote-helpers.sh: Skip with prereq on python <2.4
10022 t/t7800-difftool.sh: Skip with prereq on no PERL
10023 t/README: Update "Skipping tests" to align with best practices
10024 t/t1304-default-acl: change from skip_all=* to prereq skip
10025 t/t5705-clone-2gb: change from skip_all=* to prereq skip
10026 t/t7005-editor: change from skip_all=* to prereq skip
10027 t/t5503-tagfollow: change from skip_all=* to prereq skip
10028 t/t4016-diff-quote: change from skip_all=* to prereq skip
10029 t/t3902-quoted: change from skip_all=* to prereq skip
10030 t/t3300-funny-names: change from skip_all=* to prereq skip
10031 git-notes: Run partial expensive test everywhere
10032 t/Makefile: Create test-results dir for smoke target
10033 tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
10034 t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
10035 lib-patch-mode tests: change from skip_all=* to prereq skip
10036 t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
10037 t/t9001-send-email.sh: Remove needless PROG=* assignment
10038 t/t9001-send-email.sh: change from skip_all=* to prereq skip
10039 t/t9001-send-email.sh: convert setup code to tests
10040 t/t7105-reset-patch.sh: Add a PERL prerequisite
10041 t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
10042 t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
10043 tests: fix syntax error in "Use advise() for hints" test
10044 compat/regex: use the regex engine from gawk for compat
10045 compat/regex: get the gawk regex engine to compile within git
10046 compat/regex: define out variables only used under RE_ENABLE_I18N
10047 t/t9010-svn-fe.sh: add an +x bit to this test
10048 t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND
10049 reset: suggest what to do upon "git reset --mixed <paths>"
10050 test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
10051 test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
10052 test-lib: Allow overriding of TEST_DIRECTORY
10053 t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
10054 test-lib: use subshell instead of cd $new && .. && cd $old
10057 Version v1.7.2.5; changes since v1.7.2.4:
10058 -----------------------------------------
10060 Jakub Narębski (1):
10061 gitweb: Introduce esc_attr to escape attributes of HTML elements
10063 Junio C Hamano (1):
10067 Version v1.7.2.4; changes since v1.7.2.3:
10068 -----------------------------------------
10071 diff.c: call regfree to free memory allocated by regcomp when necessary
10072 xdiff-interface.c: always trim trailing space from xfuncname matches
10075 cache_tree_free: Fix small memory leak
10076 revert: Fix trivial comment style issue
10079 Fix whitespace issue in object.c
10082 git-commit.txt: (synopsis): move -i and -o before "--"
10085 t5505: add missing &&
10087 Jonathan Nieder (1):
10088 add: introduce add.ignoreerrors synonym for add.ignore-errors
10090 Junio C Hamano (3):
10091 tag.c: whitespace breakages fix
10092 t3101: modernise style
10096 config.txt: fix placement of diff.noprefix
10099 compat/nedmalloc: don't force NDEBUG on the rest of git
10102 bash: Match lightweight tags in prompt
10105 Version v1.7.2.3; changes since v1.7.2.2:
10106 -----------------------------------------
10109 Makefile: link builtins residing in bin directory to main git binary too
10110 Makefile: make hard/symbolic links for non-builtins too
10113 fetch: allow command line --tags to override config
10116 submodule sync: Update "submodule.<name>.url"
10119 t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
10120 pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
10121 tree-walk: Correct bitrotted comment about tree_entry()
10124 pack-refs: remove newly empty directories
10127 for-each-ref: fix objectname:short bug
10130 t7403: add missing &&'s
10132 Jonathan Nieder (12):
10133 t4150 (am): style fix
10134 t4150 (am): futureproof against failing tests
10135 t3400 (rebase): whitespace cleanup
10136 archive: abbreviate substituted commit ids again
10137 checkout, commit: remove confusing assignments to rev.abbrev
10138 examples/commit: use --abbrev for commit summary
10139 Documentation: flesh out “git pull” description
10140 core: Stop leaking ondisk_cache_entrys
10141 read-tree: stop leaking tree objects
10142 write-tree: Avoid leak when index refers to an invalid object
10143 t3302 (notes): Port to Solaris
10144 parse-options: clarify PARSE_OPT_NOARG description
10146 Junio C Hamano (6):
10147 Teach "apply --index-info" to handle rename patches
10148 rebase: protect against diff.renames configuration
10149 diff --follow: do not waste cycles while recursing
10150 diff --follow: do call diffcore_std() as necessary
10151 Prepare for 1.7.2.3
10154 Linus Torvalds (1):
10155 Fix 'git log' early pager startup error case
10158 Tell ignore file about generate files in /gitweb/static
10161 xmalloc: include size in the failure message
10162 t0003: add missing && at end of lines
10165 fix >4GiB source delta assertion failure
10167 Ralf Wildenhues (1):
10168 Typos in code comments, an error message, documentation
10171 mingw_utime(): handle NULL times parameter
10172 rerere: fix overeager gc
10175 builtin/merge_recursive.c: Add an usage string and make use of it.
10178 Documentation/git-reset: reorder modes for soft-mixed-hard progression
10179 Documentation/reset: separate options by mode
10180 Documentation/reset: promote 'examples' one section up
10181 Documentation/reset: reorder examples to match description
10182 Documentation/reset: move "undo permanently" example behind "make topic"
10185 Documentation: spelling fixes
10187 Ævar Arnfjörð Bjarmason (1):
10188 log: test for regression introduced in v1.7.2-rc0~103^2~2
10191 Version v1.7.2.2; changes since v1.7.2.1:
10192 -----------------------------------------
10195 Documentation: cite git-am from git-apply
10198 t/t7003: replace \t with literal tab in sed expression
10200 Clément Poulain (1):
10201 git-gui: use textconv filter for diff and blame
10203 David D. Kilzer (1):
10204 Fix git rebase --continue to work with touched files
10207 git-gui: check whether systems nice command works or disable it
10208 git-gui: fix usage of themed widgets variable
10209 git-gui: fix usage of _gitworktree when creating shortcut for windows
10210 git-gui: fix PATH environment for mingw development environment
10211 git-gui: fix shortcut creation on cygwin
10213 Jakub Narębski (1):
10214 diff: strip extra "/" when stripping prefix
10216 Jonathan Nieder (7):
10217 check-ref-format: handle subcommands in separate functions
10218 Allow "check-ref-format --branch" from subdirectory
10219 Makefile: add missing dependencies on url.h
10220 Makefile: add missing dependency on http.h
10221 Documentation: add a FILES section for show-ref
10222 gitweb: clarify search results page when no matching commit found
10223 Standardize do { ... } while (0) style
10225 Junio C Hamano (4):
10226 Fix DIFF_QUEUE_CLEAR refactoring
10227 Documentation: reporting bugs
10228 sha1_name.c: fix parsing of ":/token" syntax
10231 Markus Heidelberg (1):
10232 git-gui: fix "Explore Working Copy" for Windows again
10235 Document ls-files -t as semi-obsolete.
10236 pretty-options.txt: match --format's documentation with implementation.
10237 Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C
10238 post-receive-email: remove spurious commas in email subject
10239 push: mention "git pull" in error message for non-fast forwards
10241 Michael J Gruber (1):
10242 Documentation/git-log: Clarify --full-diff
10245 index-pack: Don't follow replace refs.
10248 git-gui: Handle failure of core.worktree to identify the working directory.
10249 git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32
10250 git-gui: mc cannot be used before msgcat has been loaded
10251 git-gui: fix size and position of window panes on startup
10253 Raja R Harinath (1):
10254 fast-import: export correctly marks larger than 2^20-1
10256 Ramkumar Ramachandra (2):
10257 contrib/svn-fe: Fix IncludePath
10258 contrib/svn-fe: Add the svn-fe target to .gitignore
10261 notes: allow --dry-run for -n and --verbose for -v
10262 prune: allow --dry-run for -n and --verbose for -v
10264 Shawn O. Pearce (1):
10265 smart-http: Don't deadlock on server failure
10268 xsize_t: check whether we lose bits
10269 Documentation/rev-parse: quoting is required with --parseopt
10270 t7003: fix subdirectory-filter test
10273 git-rebase: fix typo when parsing --force-rebase
10275 Ævar Arnfjörð Bjarmason (4):
10276 test-lib: Ignore --quiet under a TAP harness
10277 test-lib: Remove 3 year old no-op --no-python option
10278 imap-send: Fix sprintf usage
10279 t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH
10282 Version v1.7.2.1; changes since v1.7.2:
10283 ---------------------------------------
10286 git-rebase--interactive.sh: use printf instead of echo to print commit message
10289 git-instaweb: Fix custom apache log placement
10290 git-instaweb: Fix Apache environment variable passing
10291 git-instaweb: Don't assume Apache executable is named apache2
10294 Check size of path buffer before writing into it
10297 t3700-add: fix dependence on stdout and stderr buffering
10300 INSTALL: configure /etc/xml/catalog to build docs on Cygwin
10302 Jonathan Nieder (1):
10303 config --get --path: check for unset $HOME
10305 Junio C Hamano (3):
10311 Clarify help message when no remote is specified in fetch/pull.
10313 Nathan W. Panike (1):
10314 Add a google-chrome option for web--browse
10316 Nguyễn Thái Ngọc Duy (1):
10317 git-read-tree.txt: acknowledge the directory matching bug in sparse checkout
10320 request-pull.txt: Document -p option
10321 commit: remove full stop from usage help for -u
10324 Cast execl*() NULL sentinels to (char *)
10325 Document receive.denyDeleteCurrent
10326 Documentation/git-push: Explain status output in more detail
10327 Fix 'git' wrapper usage string
10328 Makefile: add check-docs exception for gitrevisions
10331 Version v1.7.2; changes since v1.7.2-rc3:
10332 -----------------------------------------
10335 Makefile: remove some unnecessary curly braces
10336 Makefile: work around ksh's failure to handle missing list argument to for loop
10337 t/README: clarify test_must_fail description
10338 t/t3700: convert two uses of negation operator '!' to use test_must_fail
10339 t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail
10340 t/: work around one-shot variable assignment with test_must_fail
10343 Documentation: Explain git-mergetool's use of temporary files
10346 Reorganize `git-log' man page to clarify common diff options.
10349 Check size of path buffer before writing into it
10352 MERGE_RR is in .git, not .git/rr-cache
10355 git add: Add the "--ignore-missing" option for the dry run
10356 git submodule add: Require the new --force option to add ignored paths
10358 Jonathan Nieder (9):
10359 t7006 (pager): introduce helper for parameterized tests
10360 t7006: test pager configuration for several git commands
10361 tests: local config file should be honored from subdirs of toplevel
10362 t3000 (ls-files -o): modernize style
10363 git --paginate: paginate external commands again
10364 gitmodules.5: url can be a relative path
10365 Documentation: add submodule.* to the big configuration variable list
10366 Add a sample user for the svndump library
10367 t/README: correct an exception when breaking a && chain in tests
10369 Junio C Hamano (7):
10370 rebase-i: style fix
10371 rebase-i: do not get fooled by a log message ending with backslash
10372 do not write out index when status does not have to
10373 diff A...B: give one possible diff when there are more than one merge-base
10374 diff A...B: do not limit the syntax too narrowly
10375 tests: correct "does reflog exist?" tests
10378 Michael J Gruber (3):
10379 Documentation: split off rev doc into include file
10380 Documentation: gitrevisions
10381 Documentation: link to gitrevisions rather than git-rev-parse
10384 grep -O: Do not pass color sequences as filenames to pager
10386 Nguyễn Thái Ngọc Duy (1):
10387 git --paginate: do not commit pager choice too early
10389 Nicolas Sebrecht (1):
10390 merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
10392 Pavan Kumar Sunkara (1):
10393 gitweb: fix esc_url
10396 update-server-info: Shorten read_pack_info_file()
10399 git-svn: write memoized data explicitly to avoid Storable bug
10402 Only run aggregate-results over actual counts
10405 add basic tests for merge-tree
10406 merge-tree: fix where two branches share no changes
10408 Ævar Arnfjörð Bjarmason (3):
10409 git submodule: add submodules with git add -f <path>
10410 git submodule add: Remove old docs about implicit -f
10411 git add: Add --ignore-missing to SYNOPSIS
10414 Version v1.7.2-rc3; changes since v1.7.2-rc2:
10415 ---------------------------------------------
10418 diff.c: fix a graph output bug
10420 Fredrik Skolmli (1):
10421 Documentation: Spelling fix in protocol-capabilities.txt
10424 t0005: work around strange $? in ksh when program terminated by a signal
10426 Jonathan Nieder (1):
10427 t9118 (git-svn): prevent early failure from taking down later tests
10429 Junio C Hamano (2):
10430 Fix "read-tree -m A B" priming the cache-tree
10433 Michael J Gruber (3):
10434 t9118: avoid PEG revision identifier in tests
10435 test-lib: simplify GIT_SKIP_TESTS loop
10436 test-lib: TAP compliance for skipping tests on request
10439 format-patch: document the format.to configuration setting
10441 Nicolas Sebrecht (1):
10442 checkout: accord documentation to what git does
10445 git fetch documentation: describe short '-p' synonym to '--prune' option
10447 Raja R Harinath (1):
10448 Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()
10450 Ævar Arnfjörð Bjarmason (1):
10451 tests: Use skip_all=* to skip tests
10454 Version v1.7.2-rc2; changes since v1.7.2-rc1:
10455 ---------------------------------------------
10458 t/t9700/test.pl: don't access private object members, use public access methods
10459 t/t0006: specify timezone as EST5 not EST to comply with POSIX
10462 Documentation/git-gc.txt: add reference to githooks
10465 xdiff: optimise for no whitespace difference when ignoring whitespace.
10468 add missing && to submodule-merge testcase
10470 Jakub Narębski (1):
10471 gitweb: Move evaluate_gitweb_config out of run_request
10474 t0006: test timezone parsing
10475 parse_date: fix signedness in timezone calculation
10476 test-date: fix sscanf type conversion
10478 Jonathan Nieder (1):
10479 t/README: document more test helpers
10481 Junio C Hamano (4):
10482 Updates from the list to 1.7.2 Release Notes
10483 t/README: proposed rewording...
10484 backmerge a few more fixes to 1.7.1.X series
10487 Michael J Gruber (1):
10488 rerere.txt: Document forget subcommand
10490 Pierre Habouzit (1):
10491 fix git branch -m in presence of cross devices
10493 Uwe Kleine-König (1):
10494 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
10496 Ævar Arnfjörð Bjarmason (13):
10497 test-lib: Adjust output to be valid TAP format
10498 test-lib: Make the test_external_* functions TAP-aware
10499 test-lib: output a newline before "ok" under a TAP harness
10500 tests: Skip tests in a way that makes sense under TAP
10501 tests: Say "pass" rather than "ok" on empty lines for TAP
10502 t9700: Use Test::More->builder, not $Test::Builder::Test
10503 t/README: The trash is in 't/trash directory.$name'
10504 t/README: Typo: paralell -> parallel
10505 t/README: Document the prereq functions, and 3-arg test_*
10506 t/README: Document test_external*
10507 t/README: Document test_expect_code
10508 t/README: Add a section about skipping tests
10509 t/README: Document the do's and don'ts of tests
10512 Version v1.7.2-rc1; changes since v1.7.2-rc0:
10513 ---------------------------------------------
10516 bash-completion: Fix __git_ps1 to work with "set -u"
10517 bash completion: Support "divergence from upstream" messages in __git_ps1
10520 t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression
10521 t/t7811-grep-open.sh: ensure fake "less" is made executable
10522 t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script
10523 t/t9001: use egrep when regular expressions are involved
10525 Brian Gernhardt (1):
10526 t4027,4041: Use test -s to test for an empty file
10528 Christian Couder (1):
10529 revert: accept arbitrary rev-list options
10532 notes: check number of parameters to "git notes copy"
10535 git diff: rename test that had a conflicting name
10536 Add optional parameters to the diff option "--ignore-submodules"
10537 git submodule: ignore dirty submodules for summary and status
10538 Add the option "--ignore-submodules" to "git status"
10540 Johannes Schindelin (3):
10541 Unify code paths of threaded greps
10542 grep: Add the option '--open-files-in-pager'
10543 grep -O: allow optional argument specifying the pager (or editor)
10545 Jonathan Nieder (3):
10546 grep: refactor grep_objects loop into its own function
10547 t3508 (cherry-pick): futureproof against unmerged files
10548 revert: do not rebuild argv on heap
10550 Julian Phillips (6):
10551 string_list: Fix argument order for print_string_list
10552 string_list: Fix argument order for for_each_string_list
10553 string_list: Fix argument order for string_list_insert
10554 string_list: Fix argument order for string_list_insert_at_index
10555 string_list: Fix argument order for string_list_lookup
10556 string_list: Fix argument order for string_list_append
10558 Junio C Hamano (5):
10559 url_decode: URL scheme ends with a colon and does not require a slash
10560 Update draft release notes to 1.7.1.1
10562 git.spec.in: Add gitweb subpackage
10565 Michael J Gruber (4):
10566 t6018: add tests for rev-list's --branches and --tags
10567 t6018: make sure all tested symbolic names are different revs
10568 git-rev-parse.txt: Document ":path" specifier
10569 git-rev-parse.txt: Add more examples for caret and colon
10572 commit.h: add 'type' to struct name_decoration
10573 log-tree.c: Use struct name_decoration's type for classifying decoration
10574 log --decorate: Colorize commit decorations
10575 Allow customizable commit decorations colors
10576 Add test for correct coloring of git log --decoration
10578 Ramsay Allan Jones (2):
10579 msvc: Select the "fast" definition of the {get,put}_be32() macros
10580 notes: Initialise variable to appease gcc
10583 rev-list: introduce --count option
10586 Version v1.7.2-rc0; changes since v1.7.1.4:
10587 -------------------------------------------
10590 Allow passing of configuration parameters in the command line
10591 Use strbufs instead of open-coded string manipulation
10594 textconv: make the API public
10595 textconv: support for blame
10596 t/t8006: test textconv support for blame
10599 Add a macro DIFF_QUEUE_CLEAR.
10600 Make diffcore_std only can run once before a diff_flush
10601 Make git log --follow find copies among unmodified files.
10602 Add a prefix output callback to diff output
10603 Output the graph columns at the end of the commit message
10604 diff.c: Output the text graph padding before each diff line
10605 Emit a whole line in one go
10606 graph.c: register a callback for graph output
10607 Make --color-words work well with --graph
10610 t/t5800: skip if python version is older than 2.5
10611 git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh
10612 t/t5150: remove space from sed script
10613 t/t7006: ignore return status of shell's unset builtin
10614 t/aggregate-results: accomodate systems with small max argument list length
10615 Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS
10616 Remove python 2.5'isms
10618 Brian Gernhardt (1):
10619 Makefile: Simplify handling of python scripts
10622 whitespace: add tab-in-indent error class
10623 whitespace: tests for git-diff --check with tab-in-indent error class
10624 whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
10625 whitespace: add tab-in-indent support for --whitespace=fix
10626 whitespace: tests for git-apply --whitespace=fix with tab-in-indent
10628 Christian Couder (13):
10629 revert: use strbuf to refactor the code that writes the merge message
10630 revert: refactor merge recursive code into its own function
10631 merge: refactor code that calls "git merge-STRATEGY"
10632 merge: make function try_merge_command non static
10633 revert: add "--strategy" option to choose merge strategy
10634 revert: cleanup code for -x option
10635 revert: use run_command_v_opt() instead of execv_git_cmd()
10636 revert: refactor code into a do_pick_commit() function
10637 revert: change help_msg() to take no argument
10638 revert: allow cherry-picking more than one commit
10639 revert: add tests to check cherry-picking many commits
10640 Documentation/cherry-pick: describe passing more than one commit
10641 Documentation/revert: describe passing more than one commit
10643 Clément Poulain (3):
10644 sha1_name: add get_sha1_with_context()
10645 textconv: support for cat_file
10646 t/t8007: test textconv support for cat-file
10648 Daniel Knittl-Frank (1):
10649 Show branch information in short output of git status
10652 Add `%B' in format strings for raw commit body in `git log' and friends
10655 diff: add configuration option for disabling diff prefixes.
10658 git svn: avoid unnecessary '/' in paths for SVN
10661 git checkout: create unparented branch by --orphan
10662 Documentation: alter checkout --orphan description
10663 refs: split log_ref_write logic into log_ref_setup
10664 checkout --orphan: respect -l option always
10665 t3200: test -l with core.logAllRefUpdates options
10666 bash completion: add --orphan to 'git checkout'
10668 Erik Faye-Lund (1):
10669 mingw: use _commit to implement fsync
10671 Eyvind Bernhardsen (4):
10672 Add tests for per-repository eol normalization
10673 Add per-repository eol normalization
10674 Rename the "crlf" attribute "text"
10675 Add "core.eol" config variable
10677 Finn Arne Gangstad (1):
10678 autocrlf: Make it work also for un-normalized repositories
10680 Gary V. Vaughan (17):
10681 Makefile: pass CPPFLAGS through to fllow customization
10682 Rewrite dynamic structure initializations to runtime assignment
10683 Makefile: -lpthread may still be necessary when libc has only pthread stubs
10684 enums: omit trailing comma for portability
10685 Do not use "diff" found on PATH while building and installing
10686 tests: use "test_cmp", not "diff", when verifying the result
10687 test_cmp: do not use "diff -u" on platforms that lack one
10688 git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
10689 Makefile: some platforms do not have hstrerror anywhere
10690 Make NO_{INET_NTOP,INET_PTON} configured independently
10691 Some platforms lack socklen_t type
10692 Allow disabling "inline"
10693 inline declaration does not work on AIX
10694 Makefile: SunOS 5.6 portability fix
10695 Makefile: HPUX11 portability fixes
10696 Makefile: HP-UX 10.20 portability fixes
10697 Makefile: Tru64 portability fix
10699 Giuseppe Scrivano (1):
10700 print the usage string on stdout instead of stderr
10702 Henrik Grubbström (2):
10703 convert: Safer handling of $Id$ contraction.
10704 convert: Keep foreign $Id$ on checkout.
10706 Jakub Narębski (16):
10707 Export more test-related variables when running external tests
10708 gitweb: href(..., -path_info => 0|1)
10709 gitweb: Use nonlocal jump instead of 'exit' in die_error
10710 gitweb: Add custom error handler using die_error
10711 gitweb: Move generating page title to separate subroutine
10712 gitweb: Silence 'Variable VAR may be unavailable' warnings
10713 gitweb: Improve installation instructions in gitweb/INSTALL
10714 gitweb: Create install target for gitweb in Makefile
10715 gitweb: Refactor syntax highlighting support
10716 gitweb: Put all per-connection code in run() subroutine
10717 git-instaweb: Remove pidfile after stopping web server
10718 git-instaweb: Wait for server to start before running web browser
10719 git-instaweb: Add support for running gitweb via 'plackup'
10720 gitweb: Run in FastCGI mode if gitweb script has .fcgi extension
10721 gitweb: Fix typo in hash key name in %opts in git_header_html
10722 gitweb: Return or exit after done serving request
10725 git-am: suggest what to do with superfluous patches
10728 t5516-fetch-push.sh: style cleanup
10731 make commit_tree a library function
10732 introduce notes-cache interface
10733 textconv: refactor calls to run_textconv
10734 diff: cache textconv output
10735 diff: avoid useless filespec population
10736 script with rev-list instead of log
10737 tests: rename duplicate t4205
10738 tests: chmod +x t5150
10739 make url-related functions reusable
10740 decode file:// and ssh:// URLs
10741 Makefile: default pager on AIX to "more"
10744 diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
10745 Documentation/rev-list-options.txt: Fix missing line in example history graph
10746 Documentation/rev-list-options.txt: Explain --ancestry-path
10747 revision: Fix typo in --ancestry-path error message
10748 revision: Turn off history simplification in --ancestry-path mode
10750 Johannes Schindelin (1):
10751 gitweb: Syntax highlighting support
10753 Johannes Sixt (11):
10754 Modernize t5530-upload-pack-error.
10755 Make report() from usage.c public as vreportf() and use it.
10756 Fix signature of fcntl() compatibility dummy
10757 Windows: more pthreads functions
10758 Reimplement async procedures using pthreads
10759 Dying in an async procedure should only exit the thread, not the process.
10760 Enable threaded async procedures whenever pthreads is available
10761 Have set_try_to_free_routine return the previous routine
10762 Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
10763 Recent MinGW has a C99 implementation of snprintf functions
10764 merge-recursive: demonstrate an incorrect conflict with submodule
10766 Jonathan Nieder (17):
10767 t7400: split setup into multiple tests
10768 t7400: clarify 'submodule add' tests
10769 t7400: clarify submodule update tests
10770 t5800: testgit helper requires Python support
10771 tests for request-pull
10772 request-pull: protect against OPTIONS_KEEPDASHDASH from environment
10773 fsck: check ident lines in commit objects
10774 adapt request-pull tests for new pull request format
10775 pretty: initialize new cmt_fmt_map to 0
10776 Makefile: fix header dependency checker to allow NO_CURL builds
10777 Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
10778 git svn: avoid uninitialized var in 'reset'
10779 Add git remote set-branches
10780 fsck: fix bogus commit header check
10781 rebase: improve error message when upstream argument is missing
10782 DWIM 'git show -5' to 'git show --do-walk -5'
10783 git-svn: strip off leading slashes on --trunk argument
10785 Junio C Hamano (31):
10786 git_config_maybe_bool()
10787 log.decorate: usability fixes
10788 whitespace: we cannot "catch all errors known to git" anymore
10789 GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries
10790 Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM
10791 log --pretty/--oneline: ignore log.decorate
10792 war on "sleep" in tests
10793 reflog --expire-unreachable: avoid merge-base computation
10794 log.decorate: only ignore it under "log --pretty=raw"
10795 wt-status: remove unused workdir_untracked member
10796 wt-status: plug memory leak while collecting untracked files
10797 wt-status: collect ignored files
10798 wt-status: rename and restructure status-print-untracked
10799 status: --ignored option shows ignored files
10800 Document gc.<pattern>.reflogexpire variables
10801 more war on "sleep" in tests
10802 reflog --expire-unreachable: special case entries in "HEAD" reflog
10803 revision: --ancestry-path
10804 wt-status: fix 'fprintf' compilation warning
10805 t5150: protect backslash with backslash in shell
10807 fixup: do not unconditionally disable "diff -u"
10808 build: propagate $DIFF to scripts
10809 test-lib: use DIFF definition from GIT-BUILD-OPTIONS
10810 Update draft release notes to 1.7.2
10811 Update draft release notes to 1.7.2
10812 Update draft release notes to 1.7.2
10813 Drop items that are 1.7.1.1 fixes from the 1.7.1 release notes
10814 Update draft release notes to 1.7.2
10815 url.c: "<scheme>://" part at the beginning should not be URL decoded
10818 Lars R. Damerow (3):
10819 config.c: remove static keyword from git_env_bool()
10820 truncate cwd string before printing error message
10821 Add support for GIT_ONE_FILESYSTEM
10823 Linus Torvalds (1):
10824 Make :/ accept a regex rather than a fixed pattern
10826 Michael J Gruber (5):
10827 for-each-ref: Field with abbreviated objectname
10828 notes: dry-run and verbose options for prune
10829 Documentation+t5708: document and test status -s -b
10830 pretty: Introduce ' ' modifier to add space if non-empty
10831 git-cat-file.txt: Document --textconv
10833 Michael J. Kiwala (1):
10834 git svn: fix empty directory creation
10837 patch-id: extract parsing one diff out of generate_id_list
10838 patch-id: Add support for mbox format
10840 Pavan Kumar Sunkara (6):
10841 gitweb: Use @diff_opts while using format-patch
10842 gitweb: Move static files into seperate subdirectory
10843 gitweb: Set default destination directory for installing gitweb in Makefile
10844 git-instaweb: Put httpd logs in a "$httpd_only" subdirectory
10845 git-instaweb: Configure it to work with new gitweb structure
10846 git-web--browse: Add support for google chrome and chromium
10848 Ramkumar Ramachandra (4):
10849 git am: Set cmdline globally
10850 git am: Display some help text when patch is empty
10851 git am: Remove stray error message from sed
10852 Refactor parse_date for approxidate functions
10855 grep: add test script for binary file handling
10856 grep: grep: refactor handling of binary mode options
10857 grep: --count over binary
10858 grep: --name-only over binary
10859 grep: use memmem() for fixed string search
10860 grep: continue case insensitive fixed string search after NUL chars
10861 grep: use REG_STARTEND for all matching if available
10862 grep: support NUL chars in search strings for -F
10865 gitweb: Add support for FastCGI, using CGI::Fast
10866 git-cvsserver: use a password file cvsserver pserver
10868 Samuel Tardieu (2):
10869 Honor "tagopt = --tags" configuration option
10870 remote add: add a --[no-]tags option
10873 branch: exit status now reflects if branch listing finds an error
10874 branch: don't fail listing branches if one of the commits wasn't found
10877 format-patch: Add a signature option (--signature)
10878 completion: Add --signature and format.signature
10881 Add `log.decorate' configuration variable.
10883 Sverre Rabbelier (7):
10884 clone: pass the remote name to remote_get
10885 clone: also configure url for bare clones
10886 fast-import: always create marks_file directories
10887 remote-helpers: allow requesing the path to the .git directory
10888 remote-helpers: add support for an export command
10889 remote-helpers: add testgit helper
10890 remote-helpers: add tests for testgit helper
10893 ls-remote: fall-back to default remotes when no remote specified
10894 ls-remote: print URL when no repo is specified
10897 diff: add --word-diff option that generalizes --color-words
10898 Complete prototype of git_config_from_parameters()
10899 fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
10900 log_ref_setup: don't return stack-allocated array
10901 parseopt: wrap rev-parse --parseopt usage for eval consumption
10903 Torsten Schmutzler (1):
10904 git-svn: mangle refnames forbidden in git
10907 pretty: make it easier to add new formats
10908 pretty: add infrastructure for commit format aliases
10909 pretty: add aliases for pretty formats
10910 diff-options: make --patch a synonym for -p
10912 Ævar Arnfjörð Bjarmason (12):
10913 Add option to git-commit to allow empty log messages
10914 git-svn documentation: minor grammar fix
10915 git-svn: Remove unused use of File::Temp
10916 git-cvsserver: authentication support for pserver
10917 git-cvsserver: indent & clean up authdb code
10918 git-cvsserver: Improved error handling for pserver
10919 git-cvsserver: document making a password without htpasswd
10920 git-cvsserver: test for pserver authentication support
10921 git-submodule foreach: Add $toplevel variable
10922 Makefile: remove redundant munging of @@INSTLIBDIR@@
10923 git-cvsserver: typo in a comment: bas -> has
10924 git-cvsserver: fix error for invalid password formats
10927 Version v1.7.1.4; changes since v1.7.1.3:
10928 -----------------------------------------
10930 Jakub Narębski (1):
10931 gitweb: Introduce esc_attr to escape attributes of HTML elements
10933 Junio C Hamano (1):
10937 Version v1.7.1.3; changes since v1.7.1.2:
10938 -----------------------------------------
10940 Jonathan Nieder (1):
10941 add: introduce add.ignoreerrors synonym for add.ignore-errors
10943 Junio C Hamano (1):
10947 t0003: add missing && at end of lines
10950 Version v1.7.1.2; changes since v1.7.1.1:
10951 -----------------------------------------
10954 t/README: clarify test_must_fail description
10957 Documentation/git-gc.txt: add reference to githooks
10960 Documentation: Explain git-mergetool's use of temporary files
10963 xdiff: optimise for no whitespace difference when ignoring whitespace.
10965 Fredrik Skolmli (1):
10966 Documentation: Spelling fix in protocol-capabilities.txt
10969 Check size of path buffer before writing into it
10970 Check size of path buffer before writing into it
10973 add missing && to submodule-merge testcase
10976 receive-pack: switch global variable 'commands' to a parameter
10977 receive-pack: detect aliased updates which can occur with symrefs
10980 t0006: test timezone parsing
10981 test-date: fix sscanf type conversion
10984 t0005: work around strange $? in ksh when program terminated by a signal
10986 Jonathan Nieder (3):
10987 gitmodules.5: url can be a relative path
10988 Documentation: add submodule.* to the big configuration variable list
10989 config --get --path: check for unset $HOME
10991 Junio C Hamano (3):
10992 backmerge a few more fixes to 1.7.1.X series
10996 Michael J Gruber (3):
10997 git-rev-parse.txt: Document ":path" specifier
10998 git-rev-parse.txt: Add more examples for caret and colon
10999 rerere.txt: Document forget subcommand
11002 format-patch: document the format.to configuration setting
11004 Nicolas Sebrecht (1):
11005 checkout: accord documentation to what git does
11008 git fetch documentation: describe short '-p' synonym to '--prune' option
11010 Pavan Kumar Sunkara (1):
11011 gitweb: fix esc_url
11013 Pierre Habouzit (1):
11014 fix git branch -m in presence of cross devices
11017 update-server-info: Shorten read_pack_info_file()
11020 request-pull.txt: Document -p option
11023 check_aliased_update: strcpy() instead of strcat() to copy
11025 Uwe Kleine-König (1):
11026 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
11029 Version v1.7.1.1; changes since v1.7.1:
11030 ---------------------------------------
11032 Alexey Mahotkin (1):
11033 xdiff/xmerge.c: use memset() instead of explicit for-loop
11036 diff: fix coloring of extended diff headers
11038 Björn Gustavsson (1):
11039 apply: Allow blank *trailing* context lines to match beyond EOF
11041 Björn Steinbrink (1):
11042 diff: Support visibility modifiers in the PHP hunk header regexp
11045 blame-options.txt: Add default value for `-M/-C` options.
11048 t/t9001: use egrep when regular expressions are involved
11051 unpack-trees: Make index lookahead less pessimal
11053 Brian Gernhardt (4):
11054 send-email: Cleanup { style
11055 send-email: Don't use FQDNs without a '.'
11056 Document send-email --smtp-domain
11057 send-email: Cleanup smtp-domain and add config
11059 Charles Bailey (2):
11060 stash: Don't overwrite files that have gone from the index
11061 stash tests: stash can lose data in a file removed from the index
11064 exec_cmd.c: replace hard-coded path list with one from <paths.h>
11066 Christian Couder (3):
11067 diff: fix "git show -C -C" output when renaming a binary file
11068 commit: use value of GIT_REFLOG_ACTION env variable as reflog message
11069 Documentation: grep: fix asciidoc problem with --
11071 Clemens Buchacher (7):
11072 do not overwrite files marked "assume unchanged"
11073 Documentation: git-add does not update files marked "assume unchanged"
11074 test get_git_work_tree() return value for NULL
11075 get_cwd_relative(): do not misinterpret suffix as subdirectory
11076 setup: document prefix
11077 quote.c: separate quoting and relative path generation
11078 ls-files: allow relative pathspec
11080 Dmitry Potapov (1):
11081 hash_object: correction for zero length file
11083 Gary V. Vaughan (1):
11084 git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX
11087 git-submodule.sh: properly initialize shell variables
11089 Henrik Grubbström (3):
11090 attr: Fixed debug output for macro expansion.
11091 attr: Allow multiple changes to an attribute on the same line.
11092 attr: Expand macros immediately when encountered.
11095 Fix "Out of memory? mmap failed" for files larger than 4GB on Windows
11097 Ian Ward Comfort (1):
11098 rebase -i: Abort cleanly if new base cannot be checked out
11100 Jakub Narębski (1):
11101 autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
11104 commit.txt: clarify how --author argument is used
11105 am: use get_author_ident_from_commit instead of mailinfo when rebasing
11106 gitweb/Makefile: fix typo in gitweb.min.css rule
11109 handle "git --bare init <dir>" properly
11110 docs: clarify meaning of -M for git-log
11111 remove over-eager caching in sha1_file_name
11112 pull: do nothing on --dry-run
11113 commit: give advice on empty amend
11114 Makefile: default pager on AIX to "more"
11115 notes: check number of parameters to "git notes copy"
11118 Thread-safe xmalloc and xrealloc needs a recursive mutex
11120 Jonathan Nieder (25):
11121 t7006: guard cleanup with test_expect_success
11122 t5704 (bundle): add tests for bundle --stdin
11123 fix "bundle --stdin" segfault
11124 test-lib: Let tests specify commands to be run at end of test
11125 commit --amend: cope with missing display name
11126 Documentation/shortlog: scripted users should not rely on implicit HEAD
11127 t4201 (shortlog): guard setup with test_expect_success
11128 t4201 (shortlog): Test output format with multiple authors
11129 shortlog: Document and test --format option
11130 test-lib: some shells do not let $? propagate into an eval
11131 cherry-pick: do not dump core when iconv fails
11132 Documentation/notes: document format of notes trees
11133 Documentation/notes: describe content of notes blobs
11134 Documentation/notes: add configuration section
11135 Documentation/notes: simplify treatment of default notes ref
11136 Documentation/log: add a CONFIGURATION section
11137 Documentation/notes: simplify treatment of default display refs
11138 Documentation/notes: clean up description of rewriting configuration
11139 Documentation/notes: nitpicks
11140 post-receive-email: document command-line mode
11141 Documentation/checkout: clarify description
11142 gitignore.5: Clarify matching rules
11143 rebase -i -p: document shortcomings
11144 Documentation/checkout: clarify description
11145 add-interactive: Clarify “remaining hunks in the file”
11147 Junio C Hamano (10):
11148 am -3: recover the diagnostic messages for corrupt patches
11149 clone: quell the progress report from init and report on clone
11150 t9129: fix UTF-8 locale detection
11151 common_prefix: simplify and fix scanning for prefixes
11152 Prepare draft release notes to 1.7.1.1
11153 Update draft release notes to 1.7.1.1
11154 tests: remove unnecessary '^' from 'expr' regular expression
11155 Update draft release notes to 1.7.1.1
11156 Update draft release notes to 1.7.1.1
11159 Leif Arne Storset (1):
11160 Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef
11162 Marcus Comstedt (1):
11163 Add "Z" as an alias for the timezone "UTC"
11165 Markus Heidelberg (4):
11166 t7508: add test for "git status" refreshing the index
11167 git status: refresh the index if possible
11168 t7508: add a test for "git status" in a read-only repository
11169 Documentation: rebase -i ignores options passed to "git am"
11171 Michael J Gruber (10):
11172 index-pack: fix trivial typo in usage string
11173 t7508: test advice.statusHints
11174 wt-status: take advice.statusHints seriously
11175 Documentation: fix minor inconsistency
11176 Documentation/gitdiffcore: fix order in pickaxe description
11177 Documentation/SubmittingPatches: clarify GMail section and SMTP
11178 completion: --set-upstream option for git-branch
11179 Makefile: reenable install with NO_CURL
11180 Documentation/config: describe status.submodulesummary
11181 Documentation: A...B shortcut for checkout and rebase
11184 test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
11187 Documentation/pretty-{formats,options}: better reference for "format:<string>"
11190 Make xmalloc and xrealloc thread-safe
11191 index-pack: smarter memory usage when resolving deltas
11192 index-pack: rationalize unpack_entry_data()
11193 index-pack: smarter memory usage when appending objects
11196 clone: reword messages to match the end-user perception
11198 Peter Collingbourne (4):
11199 Generalise the unlink_or_warn function
11200 Implement the rmdir_or_warn function
11201 Introduce remove_or_warn function
11202 Remove a redundant errno test in a usage of remove_path
11204 Philippe Bruhat (1):
11205 Git.pm: better error message
11208 Documentation/git-send-email: Add "Use gmail as the smtp server"
11210 Ramkumar Ramachandra (1):
11211 SubmittingPatches: Add new section about what to base work on
11213 Ramsay Allan Jones (4):
11214 Makefile: Fix 'clean' target to remove all gitweb build files
11215 msvc: Fix some "expr evaluates to function" compiler warnings
11216 msvc: Fix some compiler warnings
11217 notes: Initialise variable to appease gcc
11220 git diff too slow for a file
11221 remove ecb parameter from xdi_diff_outf()
11222 Fix checkout of large files to network shares on Windows XP
11225 Prompt for a username when an HTTP request 401s
11227 Shawn O. Pearce (16):
11228 tag.c: Correct indentation
11229 tag.h: Remove unused signature field
11230 tag.c: Refactor parse_tag_buffer to be saner to program
11231 tag.c: Parse tagger date (if present)
11232 describe: Break annotated tag ties by tagger date
11233 http.c: Remove bad free of static block
11234 t5550-http-fetch: Use subshell for repository operations
11235 http.c: Tiny refactoring of finish_http_pack_request
11236 http.c: Drop useless != NULL test in finish_http_pack_request
11237 http.c: Don't store destination name in request structures
11238 http.c: Remove unnecessary strdup of sha1_to_hex result
11239 Introduce close_pack_index to permit replacement
11240 Extract verify_pack_index for reuse from verify_pack
11241 Allow parse_pack_index on temporary files
11242 http-fetch: Use index-pack rather than verify-pack to check packs
11243 http-fetch: Use temporary files for pack-*.idx until verified
11245 Sverre Rabbelier (1):
11246 Gitweb: ignore built file
11248 Tay Ray Chuan (18):
11249 t5541-http-push: add test for URLs with trailing slash
11250 http: make end_url_with_slash() public
11251 remote-curl: ensure that URLs have a trailing slash
11252 http.c::new_http_pack_request: do away with the temp variable filename
11253 t7604-merge-custom-message: shift expected output creation
11254 t7604-merge-custom-message: show that --log doesn't append to -m
11255 merge: update comment
11256 merge: rename variable
11257 fmt-merge-msg: minor refactor of fmt_merge_msg()
11258 fmt-merge-msg: refactor merge title formatting
11259 fmt-merge-msg: add function to append shortlog only
11260 merge: --log appends shortlog to message if specified
11261 GIT-VERSION-GEN: restrict tags used
11262 t7502-commit: fix spelling
11263 show-branch: use DEFAULT_ABBREV instead of 7
11264 t7502-commit: add tests for summary output
11265 t7502-commit: add summary output tests for empty and merge commits
11266 commit::print_summary(): don't use format_commit_message()
11269 t/README: document --root option
11270 send-email: ask about and declare 8bit mails
11273 Documentation/SubmittingPatches: Fix typo in GMail section
11276 Change C99 comments to old-style C comments
11279 pretty: Respect --abbrev option
11282 git-mailinfo documentation: clarify -u/--encoding
11285 start_command: close cmd->err descriptor when fork/spawn fails
11287 Ævar Arnfjörð Bjarmason (3):
11288 Move t6000lib.sh to lib-*
11289 Turn setup code in t2007-checkout-symlink.sh into a test
11290 notes: Initialize variable to appease Sun Studio
11293 Version v1.7.1; changes since v1.7.1-rc2:
11294 -----------------------------------------
11297 Documentation improvements for the description of short format.
11300 MSVC: Fix build by adding missing termios.h dummy
11302 Jonathan Nieder (1):
11303 Documentation/Makefile: fix interrupted builds of user-manual.xml
11305 Junio C Hamano (2):
11309 Michael J Gruber (1):
11310 t7012: Mark missing tests as TODO
11313 reflog: remove 'show' from 'expire's usage string
11316 Version v1.7.1-rc2; changes since v1.7.1-rc1:
11317 ---------------------------------------------
11319 Charles Bailey (1):
11320 Documentation: Describe other situations where -z affects git diff
11323 git-instaweb: pass through invoking user's path to gitweb CGI scripts
11326 Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
11329 diff: use large integers for diffstat calculations
11330 rebase-interactive: silence warning when no commits rewritten
11333 gitk: Add Ctrl-W shortcut for closing the active window
11334 gitk: Display dirty submodules correctly
11336 Johannes Gilger (1):
11337 pretty: Initialize notes if %N is used
11340 Windows: start_command: Support non-NULL dir in struct child_process
11342 Jonathan Nieder (5):
11343 gitk: Add comments to explain encode_view_opts and decode_view_opts
11344 gitk: Don't clobber "Remember this view" setting
11345 Add .depend directories to .gitignore
11346 Document new "already-merged" rule for branch -d
11347 tag -v: use RUN_GIT_CMD to run verify-tag
11349 Junio C Hamano (6):
11350 SubmittingPatches: update GMail section
11351 blame documentation: -M/-C notice copied lines as well as moved ones
11353 gitweb: simplify gitweb.min.* generation and clean-up rules
11354 t3301: add tests to use --format="%N"
11357 Marc Branchaud (1):
11358 Docs: Add -X option to git-merge's synopsis.
11361 gitk: Remove forced use of sans-serif font
11362 gitk: Set the font for all spinbox widgets
11363 gitk: Set the font for all listbox widgets
11364 gitk: Use consistent font for all text input fields
11366 Matthew Ogilvie (1):
11367 t6006: do not write to /tmp
11369 Michael J Gruber (1):
11370 t1010-mktree: Adjust expected result to code and documentation
11373 gitk: Avoid calling tk_setPalette on Windows
11374 gitk: Add emacs editor variable block
11375 gitk: Fix display of copyright symbol
11377 Ramkumar Ramachandra (5):
11378 Documentation/remote-helpers: Rewrite description
11379 Documentation/urls: Rewrite to accomodate <transport>::<address>
11380 Documentation/remote-helpers: Add invocation section
11381 Fixup: Second argument may be any arbitrary string
11382 Documentation/remote-helpers: Fix typos and improve language
11385 t3507: Make test executable
11388 combined diff: correctly handle truncated file
11391 documentation: clarify direction of core.autocrlf
11394 Version v1.7.1-rc1; changes since v1.7.1-rc0:
11395 ---------------------------------------------
11398 notes.h: declare bit field as unsigned to silence compiler complaints
11401 fix const-correctness of write_sha1_file
11402 fix textconv leak in emit_rewrite_diff
11403 fix typos and grammar in 1.7.1 draft release notes
11404 docs: clarify "branch -l"
11407 Let check_preimage() use memset() to initialize "struct checkout"
11408 Teach diff --submodule and status to handle .git files in submodules
11410 Jonathan Nieder (1):
11411 Teach mailinfo %< as an alternative scissors mark
11413 Junio C Hamano (2):
11414 diff.c: work around pointer constness warnings
11418 Gitweb: add ignore and clean rules for minified files
11419 Gitweb: add support for minifying gitweb.css
11420 Gitweb: add autoconfigure support for minifiers
11421 instaweb: add minification awareness
11422 gitweb: add documentation to INSTALL regarding gitweb.js
11423 gitweb: update INSTALL to use shorter make target
11425 Michael J Gruber (2):
11426 t3301-notes: Test the creation of reflog entries
11427 refs.c: Write reflogs for notes just like for branch heads
11430 branch: say "Reset to" in reflog entries for 'git branch -f' operations
11431 fetch/push: fix usage strings
11434 Version v1.7.1-rc0; changes since v1.7.0.9:
11435 -------------------------------------------
11438 cvsimport: new -R option: generate .git/cvs-revisions mapping
11440 Anders Kaseorg (1):
11441 everyday: fsck and gc are not everyday operations
11444 Make templates honour SHELL_PATH and PERL_PATH
11445 Modernize git calling conventions in hook templates
11447 Benjamin C Meyer (1):
11448 Fix a spelling mistake in a git-p4 console message
11451 make union merge an xdl merge favor
11452 refactor merge flags into xmparam_t
11453 merge-file: add option to specify the marker size
11454 merge-file: add option to select union merge favor
11457 t/t1304: avoid -d option to setfacl
11458 t/t1304: set the Default ACL base entries
11459 t/t1304: use 'test -r' to test readability rather than looking at mode bits
11460 t/t1304: set the ACL effective rights mask
11461 t/t1304: make a second colon optional in the mask ACL check
11462 notes.c: remove inappropriate call to return
11463 t5505: remove unnecessary subshell invocations
11464 t5505: add missing &&
11465 t/t5505-remote.sh: escape * to prevent interpretation by shell as glob
11467 Brian Gernhardt (1):
11468 Use test_expect_success for test setups
11471 imap-send: suppress warning about cleartext password with CRAM-MD5
11473 Christian Couder (8):
11474 reset: add option "--keep" to "git reset"
11475 reset: add test cases for "--keep" option
11476 Documentation: reset: describe new "--keep" option
11477 reset: disallow "reset --keep" outside a work tree
11478 reset: disallow using --keep when there are unmerged entries
11479 cherry-pick: add tests for new --ff option
11480 Documentation: describe new cherry-pick --ff option
11481 rebase -i: use new --ff cherry-pick option
11483 Dave Olszewski (1):
11484 rebase--interactive: don't require what's rebased to be a branch
11487 Makefile: update defaults for modern Cygwin
11489 Eric S. Raymond (1):
11490 Integrate version 3 ciabot scripts into contrib/.
11492 Erik Faye-Lund (5):
11493 hash-object: support --stdin-paths with --no-filters
11494 git-svn: support fetch with autocrlf on
11495 Revert "git-svn: always initialize with core.autocrlf=false"
11496 cherry: support --abbrev option
11497 ls: remove redundant logic
11500 fallback SSH_ASKPASS when GIT_ASKPASS not set
11501 git-svn: Support retrieving passwords with GIT_ASKPASS
11502 git-core: Support retrieving passwords with GIT_ASKPASS
11504 Hitoshi Mitake (1):
11505 imap-send: support CRAM-MD5 authentication
11507 Ian Ward Comfort (1):
11508 RPM spec: include bash completion support
11510 Ilari Liusvaara (1):
11511 Allow '+', '-' and '.' in remote helper names
11513 Jakub Narębski (2):
11514 gitweb: esc_html (short) error message in die_error
11515 gitweb: Protect escaping functions against calling on undef
11518 git-send-email.perl: improve error message in send_message()
11519 git-send-email.perl: add option --smtp-debug
11520 git-send-email.perl - try to give real name of the calling host to HELO/EHLO
11523 submodule summary: do not shift a non-existent positional variable
11526 git diff --submodule: Show detailed dirty status of submodules
11527 git status: Show detailed dirty status of submodules in long format
11528 git submodule summary: Handle HEAD as argument when on an unborn branch
11529 Refactor dirty submodule detection in diff-lib.c
11530 git status: Fix false positive "new commits" output for dirty submodules
11531 git status: ignoring untracked files must apply to submodules too
11533 Johan Herland (32):
11534 Minor cosmetic fixes to notes.c
11535 Notes API: get_commit_notes() -> format_note() + remove the commit restriction
11536 Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
11537 Notes API: init_notes(): Initialize the notes tree from the given notes ref
11538 Notes API: add_note(): Add note objects to the internal notes tree structure
11539 Notes API: remove_note(): Remove note objects from the notes tree structure
11540 Notes API: get_note(): Return the note annotating the given object
11541 Notes API: for_each_note(): Traverse the entire notes tree with a callback
11542 Notes API: write_notes_tree(): Store the notes tree in the database
11543 Notes API: Allow multiple concurrent notes trees with new struct notes_tree
11544 Refactor notes concatenation into a flexible interface for combining notes
11545 Builtin-ify git-notes
11546 t3301: Verify successful annotation of non-commits
11547 t3305: Verify that adding many notes with git-notes triggers increased fanout
11548 Teach notes code to properly preserve non-notes in the notes tree
11549 Teach builtin-notes to remove empty notes
11550 builtin-notes: Add "remove" subcommand for removing existing notes
11551 t3305: Verify that removing notes triggers automatic fanout consolidation
11552 Notes API: prune_notes(): Prune notes that belong to non-existing objects
11553 builtin-notes: Add "prune" subcommand for removing notes for missing objects
11554 Documentation: Generalize git-notes docs to 'objects' instead of 'commits'
11555 builtin-notes: Add "list" subcommand for listing note objects
11556 builtin-notes: Add --message/--file aliases for -m/-F options
11557 builtin-notes: Add "add" subcommand for adding notes to objects
11558 builtin-notes: Add "append" subcommand for appending to note objects
11559 builtin-notes: Deprecate the -m/-F options for "git notes edit"
11560 builtin-notes: Refactor handling of -F option to allow combining -m and -F
11561 builtin-notes: Add -c/-C options for reusing notes
11562 builtin-notes: Misc. refactoring of argc and exit value handling
11563 builtin-notes: Add "copy" subcommand for copying notes between objects
11564 submodule summary: Don't barf when invoked in an empty repo
11565 builtin-notes: Minor (mostly parse_options-related) fixes
11568 Print RUNTIME_PREFIX warning only when GIT_TRACE is set
11569 Windows: redirect f[re]open("/dev/null") to f[re]open("nul")
11571 Jonathan Nieder (33):
11572 Makefile: add missing header file dependencies
11573 Makefile: make sure test helpers are rebuilt when headers change
11574 Makefile: remove wt-status.h from LIB_H
11575 Makefile: clean up http-walker.o dependency rules
11576 Makefile: drop dependency on $(wildcard */*.h)
11577 Makefile: transport.o depends on branch.h now
11578 Makefile: rearrange dependency rules
11579 Makefile: disable default implicit rules
11580 Makefile: list generated object files in OBJECTS
11581 Makefile: lazily compute header dependencies
11582 Makefile: list standalone program object files in PROGRAM_OBJS
11583 Teach Makefile to check header dependencies
11584 Do not install shell libraries executable
11585 Makefile: tuck away generated makefile fragments in .depend
11586 Makefile: always remove .depend directories on 'make clean'
11587 Makefile: clarify definition of TEST_OBJS
11588 Makefile: Fix occasional GIT-CFLAGS breakage
11589 revert: fix tiny memory leak in cherry-pick --ff
11590 tests: document format of conflicts from checkout -m
11591 tests: document cherry-pick behavior in face of conflicts
11592 xdl_merge(): add optional ancestor label to diff3-style output
11593 xdl_merge(): move file1 and file2 labels to xmparam structure
11594 merge-file --diff3: add a label for ancestor
11595 ll_merge(): add ancestor label parameter for diff3-style output
11596 checkout --conflict=diff3: add a label for ancestor
11597 merge_file(): add comment explaining behavior wrt conflict style
11598 merge_trees(): add ancestor label parameter for diff3-style output
11599 checkout -m --conflict=diff3: add a label for ancestor
11600 compat: add mempcpy()
11601 revert: clarify label on conflict hunks
11602 cherry-pick, revert: add a label for ancestor
11603 merge-recursive: add a label for ancestor
11604 Makefile: future-proof Cygwin version check
11606 Junio C Hamano (25):
11607 builtin-for-each-ref.c: comment fixes
11608 builtin-for-each-ref.c: check if we need to peel onion while parsing the format
11609 for-each-ref --format='%(symref) %(symref:short)'
11610 for-each-ref --format='%(flag)'
11612 Resurrect "git grep --no-index"
11613 Update draft release notes to 1.7.1
11614 notes: fix malformed tree entry
11615 wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
11616 submodule summary: do not fail before the first commit
11617 parse-options: add parse_options_concat() to concat options
11618 builtin/merge: make checkout_fast_forward() non static
11619 revert: add --ff option to allow fast forward when cherry-picking
11620 Update draft release notes to 1.7.1
11621 Documentation: improve description of "git reset --keep"
11622 t4013: add tests for log -p -m --first-parent
11623 revision: introduce setup_revision_opt
11624 show -c: show patch text
11625 show --first-parent/-m: do not default to --cc
11626 Makefile: update check-docs target
11627 t5516: Use test_cmp when appropriate
11628 Update draft release notes to 1.7.1
11629 Update draft release notes to 1.7.1
11630 Revert "Link against libiconv on IRIX"
11634 git-push: fix an advice message so it goes to stderr
11635 git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
11636 git-push: make git push --porcelain print "Done"
11637 git-push: add tests for git push --porcelain
11639 Linus Torvalds (1):
11640 Move 'builtin-*' into a 'builtin/' subdirectory
11642 Marc Branchaud (1):
11643 Teach rebase the --no-ff option.
11646 Add an optional argument for --color options
11647 Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
11648 grep: Colorize filename, line number, and separator
11649 grep: Colorize selected, context, and function lines
11651 Markus Heidelberg (2):
11652 builtin/commit: fix duplicated sentence in a comment
11653 builtin/commit: remove unnecessary variable definition
11655 Michael J Gruber (4):
11656 git-svn: req_svn when needed
11657 t9119-git-svn-info.sh: test with svn 1.6.* as well
11658 Documentation: fix a few typos in git-notes.txt
11659 git-svn: make git svn --version work again
11661 Michael Lukashov (4):
11662 connect.c: move duplicated code to a new function 'get_host_and_port'
11663 refactor duplicated code in builtin-send-pack.c and transport.c
11664 refactor duplicated fill_mm() in checkout and merge-recursive
11665 refactor duplicated encode_header in pack-objects and fast-import
11667 Michele Ballabio (1):
11668 shortlog: warn the user when there is no input
11671 request-pull: avoid mentioning that the start point is a single commit
11673 Nguyễn Thái Ngọc Duy (5):
11674 make_absolute_path(): Do not append redundant slash
11675 init-db, rev-parse --git-dir: do not append redundant slash
11676 Move offset_1st_component() to path.c
11677 Support working directory located at root
11678 Add test for using Git at root of file system
11681 move encode_in_pack_object_header() to a better place
11684 git log -p -m: document -m and honor --first-parent
11687 setenv(GIT_DIR) clean-up
11688 grep: enable threading for context line printing
11691 bash: improve aliased command recognition
11692 bash: support user-supplied completion scripts for user's git commands
11693 bash: support user-supplied completion scripts for aliases
11694 bash: completion for gitk aliases
11696 Stefan-W. Hahn (4):
11697 documentation: 'git-mailsplit --keep-cr' is not hidden anymore
11698 git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
11699 git-am: Add am.keepcr and --no-keep-cr to override it
11700 git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
11703 format-patch: use a string_list for headers
11704 format-patch: add --no-cc, --no-to, and --no-add-headers
11705 send-email: add --no-cc, --no-to, and --no-bcc
11706 notes: rework subcommands and parse options
11707 fmt-merge-msg: be quiet if nothing to merge
11708 t6200: modernize with test_tick
11709 t6200: test fmt-merge-msg more
11710 fmt-merge-msg: use pretty.c routines
11711 string-list: add unsorted_string_list_lookup()
11712 fmt-merge-msg: remove custom string_list implementation
11713 fmt-merge-msg: hide summary option
11716 Add `init.templatedir` configuration variable.
11717 Add a "TEMPLATE DIRECTORY" section to git-init[1].
11718 init: having keywords without value is not a global error.
11719 t/t0001-init.sh: add test for 'init with init.templatedir set'
11720 Add 'git format-patch --to=' option and 'format.to' configuration variable.
11722 Tay Ray Chuan (17):
11723 Documentation/git-clone: mention progress in -v
11724 Documentation/git-pull: put verbosity options before merge/fetch ones
11725 Documentation/git-push: put --quiet before --verbose
11726 fetch: refactor verbosity option handling into transport.[ch]
11727 push: support multiple levels of verbosity
11728 clone: support multiple levels of verbosity
11729 transport->progress: use flag authoritatively
11730 push: learn --progress
11731 fetch and pull: learn --progress
11732 transport: update flags to be in running order
11733 t5541-http-push: check that ref is unchanged for non-ff test
11734 t554[01]-http-push: refactor, add non-ff tests
11735 http-push: remove "|| 1" to enable verbose check
11736 http-walker: cleanup more thoroughly
11737 http: init and cleanup separately from http-walker
11738 remote-curl: use http_fetch_ref() instead of walker wrapper
11739 remote-curl: init walker only when needed
11742 test-lib: unset GIT_NOTES_REF to stop it from influencing tests
11743 Support showing notes from more than one notes tree
11744 Documentation: document post-rewrite hook
11745 commit --amend: invoke post-rewrite hook
11746 rebase: invoke post-rewrite hook
11747 rebase -i: invoke post-rewrite hook
11748 notes: implement 'git notes copy --stdin'
11749 notes: implement helpers needed for note copying during rewrite
11750 rebase: support automatic notes copying
11751 commit --amend: copy notes to the new commit
11752 notes: add shorthand --ref to override GIT_NOTES_REF
11753 notes: track whether notes_trees were changed at all
11754 git-notes(1): add a section about the meaning of history
11755 rebase -i: make post-rewrite work for 'edit'
11757 Tuomas Suutari (5):
11758 t9151: Fix a few commits in the SVN dump
11759 t9151: Add two new svn:mergeinfo test cases
11760 git-svn: Fix discarding of extra parents from svn:mergeinfo
11761 git-svn: Fix merge detecting with rewrite-root
11762 t9150,t9151: Add rewrite-root option to init
11764 YONETANI Tomokazu (1):
11765 Fix _XOPEN_SOURCE problem on DragonFly
11768 git svn: delay importing SVN::Base until it is needed
11771 Version v1.7.0.9; changes since v1.7.0.8:
11772 -----------------------------------------
11774 Jakub Narębski (1):
11775 gitweb: Introduce esc_attr to escape attributes of HTML elements
11777 Junio C Hamano (1):
11781 Version v1.7.0.8; changes since v1.7.0.7:
11782 -----------------------------------------
11784 Jonathan Nieder (1):
11785 add: introduce add.ignoreerrors synonym for add.ignore-errors
11787 Junio C Hamano (1):
11791 Version v1.7.0.7; changes since v1.7.0.6:
11792 -----------------------------------------
11795 Documentation improvements for the description of short format.
11798 git-submodule.sh: properly initialize shell variables
11801 Check size of path buffer before writing into it
11803 Jonathan Nieder (1):
11804 config --get --path: check for unset $HOME
11806 Junio C Hamano (1):
11809 Michael J Gruber (3):
11810 index-pack: fix trivial typo in usage string
11811 Makefile: reenable install with NO_CURL
11812 Documentation/config: describe status.submodulesummary
11815 remove ecb parameter from xdi_diff_outf()
11818 request-pull.txt: Document -p option
11820 Uwe Kleine-König (1):
11821 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
11824 Version v1.7.0.6; changes since v1.7.0.5:
11825 -----------------------------------------
11827 Charles Bailey (1):
11828 Documentation: Describe other situations where -z affects git diff
11831 Makefile: Remove usage of deprecated Python "has_key" method
11834 Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
11837 diff: use large integers for diffstat calculations
11840 MSVC: Fix build by adding missing termios.h dummy
11842 Jonathan Nieder (2):
11843 Document new "already-merged" rule for branch -d
11844 Documentation/Makefile: fix interrupted builds of user-manual.xml
11846 Junio C Hamano (1):
11849 Marc Branchaud (1):
11850 Docs: Add -X option to git-merge's synopsis.
11852 Michael J Gruber (3):
11853 rev-list: use default abbrev length when abbrev-commit is in effect
11854 t1010-mktree: Adjust expected result to code and documentation
11855 t7012: Mark missing tests as TODO
11858 reflog: remove 'show' from 'expire's usage string
11861 combined diff: correctly handle truncated file
11864 documentation: clarify direction of core.autocrlf
11867 Version v1.7.0.5; changes since v1.7.0.4:
11868 -----------------------------------------
11871 daemon.c: avoid accessing ss_family member of struct sockaddr_storage
11873 Erik Faye-Lund (1):
11874 rev-list: fix --pretty=oneline with empty message
11876 Gustaf Hendeby (1):
11877 Improve error messages from 'git stash show'
11880 docs: clarify "branch -l"
11883 Let check_preimage() use memset() to initialize "struct checkout"
11885 Junio C Hamano (3):
11886 diff --check: honor conflict-marker-size attribute
11887 blame documentation: -M/-C notice copied lines as well as moved ones
11890 Michael J Gruber (2):
11891 .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
11892 send-email: lazily assign editor variable
11894 R. Tyler Ballance (1):
11895 Correct references to /usr/bin/python which does not exist on FreeBSD
11897 Ramkumar Ramachandra (1):
11898 imap-send: Remove limitation on message body
11900 Shawn O. Pearce (1):
11901 http-backend: Don't infinite loop during die()
11904 pack-protocol.txt: fix spelling
11905 pack-protocol.txt: fix pkt-line lengths
11906 branch: say "Reset to" in reflog entries for 'git branch -f' operations
11907 fetch/push: fix usage strings
11910 Version v1.7.0.4; changes since v1.7.0.3:
11911 -----------------------------------------
11913 Björn Gustavsson (5):
11914 apply: Don't unnecessarily update line lengths in the preimage
11915 apply: Remove the quick rejection test
11916 apply: Allow blank context lines to match beyond EOF
11917 t4124: Add additional tests of --whitespace=fix
11918 t3417: Add test cases for "rebase --whitespace=fix"
11921 test for add with non-existent pathspec
11924 difftool: Fix '--gui' when diff.guitool is unconfigured
11927 Documentation: Clarify support for smart HTTP backend
11930 Don't redefine htonl and ntohl on big-endian
11931 Link against libiconv on IRIX
11932 Documentation: show-ref <pattern>s are optional
11934 Jakub Narębski (1):
11935 gitweb: git_get_project_config requires only $git_dir, not also $project
11938 Updated the usage string of git reset
11941 dir: fix COLLECT_IGNORED on excluded prefixes
11944 diff: fix textconv error zombies
11945 Windows: fix utime() for read-only files
11947 Junio C Hamano (8):
11948 git add -u: die on unmatched pathspec
11949 color: allow multiple attributes
11950 t0050: mark non-working test as such
11951 tests for "git add ignored-dir/file" without -f
11952 refs: ref entry with NULL sha1 is can be a dangling symref
11953 t9350: fix careless use of "cd"
11954 Prepare for 1.7.0.4
11958 format-patch: Squelch 'fatal: Not a range." error
11960 Markus Heidelberg (1):
11961 Documentation: explain the meaning of "-g" in git-describe output
11963 Sverre Rabbelier (1):
11964 fast-export: don't segfault when marks file cannot be opened
11967 Version v1.7.0.3; changes since v1.7.0.2:
11968 -----------------------------------------
11971 prune: honor --expire=never
11972 reflog: honor gc.reflogexpire=never
11974 Andreas Gruenbacher (3):
11975 fetch: Check for a "^{}" suffix with suffixcmp()
11976 fetch: Future-proof initialization of a refspec on stack
11977 fetch: Fix minor memory leak
11979 Dave Olszewski (1):
11980 don't use default revision if a rev was specified
11982 Filippo Negroni (1):
11983 Fix gitmkdtemp: correct test for mktemp() return value
11985 Giuseppe Bilotta (5):
11986 Refactor list of of repo-local env vars
11987 rev-parse: --local-env-vars option
11988 shell setup: clear_local_git_env() function
11989 submodules: ensure clean environment when operating in a submodule
11990 is_submodule_modified(): clear environment properly
11992 Ian Ward Comfort (1):
11993 bash: complete *_HEAD refs if present
11996 daemon: parse_host_and_port SIGSEGV if port is specified
11999 add-interactive: fix bogus diff header line ordering
12000 push: fix segfault for odd config
12002 Jonathan Nieder (1):
12003 Makefile: Fix CDPATH problem
12005 Junio C Hamano (12):
12006 "log --author=me --grep=it" should find intersection, not union
12007 Reword "detached HEAD" notification
12008 mailinfo: do not strip leading spaces even for a header line
12009 t5521: fix and modernize
12010 builtin-fetch --all/--multi: propagate options correctly
12011 fetch --all/--multiple: keep all the fetched branch information
12012 pack-objects documentation: reword "objects that appear in the standard input"
12013 Merge accumulated fixes to prepare for 1.7.0.3
12014 t9400: Use test_cmp when appropriate
12015 t/Makefile: remove test artifacts upon "make clean"
12016 Update draft release notes to 1.7.0.3
12020 grep docs: pluralize "Example" section
12021 grep docs: use AsciiDoc literals consistently
12022 grep docs: --cached and <tree>... are incompatible
12023 grep docs: document --no-index option
12026 Add a testcase for ACL with restrictive umask.
12027 Move gitmkstemps to path.c
12028 git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
12029 Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
12030 git_mkstemps_mode: don't set errno to EINVAL on exit.
12031 Use git_mkstemp_mode instead of plain mkstemp to create object files
12033 Michael J Gruber (7):
12034 Documentation/git-read-tree: fix table layout
12035 Documentation/git-read-tree: clarify 2-tree merge
12036 Documentation/git-reflog: Fix formatting of command lists
12037 Documentation/gitdiffcore: Remove misleading date in heading
12038 Documentation/urls: Remove spurious example markers
12039 Documentation/git-clone: Transform description list into item list
12040 .mailmap: Map the the first submissions of MJG by e-mail
12042 Michael Wookey (1):
12043 run-command.c: fix build warnings on Ubuntu
12046 Documentation: pack-objects: Clarify --local's semantics.
12047 pack-objects documentation: Fix --honor-pack-keep as well.
12050 blame: fix indent of line numbers
12051 for_each_recent_reflog_ent(): use strbuf, fix offset handling
12054 pull: replace unnecessary sed invocation
12057 Documentation: receive.denyCurrentBranch defaults to 'refuse'
12060 Version v1.7.0.2; changes since v1.7.0.1:
12061 -----------------------------------------
12064 unset GREP_OPTIONS in test-lib.sh
12066 Christian Couder (1):
12067 bisect: error out when passing bad path parameters
12069 Dmitry Potapov (1):
12070 hash-object: don't use mmap() for small files
12072 Erik Faye-Lund (1):
12073 run-command: support custom fd-set in async
12075 Gabriel Filion (1):
12076 require_work_tree broken with NONGIT_OK
12078 Hitoshi Mitake (1):
12079 git-imap-send: Convert LF to CRLF before storing patch to draft box
12081 Jakub Narębski (2):
12082 gitweb: Die if there are parsing errors in config file
12083 gitweb: Fix project-specific feature override behavior
12085 Jonathan Nieder (8):
12086 Fix 'git var' usage synopsis
12087 Make 'git var GIT_PAGER' always print the configured pager
12088 git.1: Clarify the behavior of the --paginate option
12089 git svn: Fix launching of pager
12090 am: Fix launching of pager
12091 tests: Add tests for automatic use of pager
12092 t7006-pager: if stdout is not a terminal, make a new one
12093 tests: Fix race condition in t7006-pager
12095 Junio C Hamano (6):
12096 t6000lib: Fix permission
12097 lib-patch-mode.sh: Fix permission
12098 status: preload index to optimize lstat(2) calls
12099 Start preparing for 1.7.0.2
12100 Update draft release notes to 1.7.0.2
12104 git diff --quiet -w: check and report the status
12105 git-diff: add a test for git diff --quiet -w
12108 stash: suggest the correct command line for unknown options.
12111 Remove extra '-' from git-am(1)
12114 fast-import: start using struct pack_idx_entry
12115 fast-import: use sha1write() for pack data
12116 fast-import: use write_idx_file() instead of custom code
12117 fast-import: make default pack size unlimited
12118 fast-import: honor pack.indexversion and pack.packsizelimit config vars
12119 fast-import: use the diff_delta() max_delta_size argument
12120 sha1_file: don't malloc the whole compressed result when writing out objects
12121 sha1_file: be paranoid when creating loose objects
12124 utf8.c: remove print_wrapped_text()
12125 utf8.c: remove print_spaces()
12126 utf8.c: remove strbuf_write()
12127 utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
12129 Shawn O. Pearce (7):
12130 run-command: Allow stderr to be a caller supplied pipe
12131 send-pack: demultiplex a sideband stream with status data
12132 receive-pack: Refactor how capabilities are shown to the client
12133 receive-pack: Wrap status reports inside side-band-64k
12134 receive-pack: Send hook output over side band #2
12135 t5401: Use a bare repository for the remote peer
12136 receive-pack: Send internal errors over side-band #2
12139 t7406: Fix submodule init config tests
12142 gitweb multiple project roots documentation
12145 transport: add got_remote_refs flag
12148 cherry_pick_list: quit early if one side is empty
12151 Version v1.7.0.1; changes since v1.7.0:
12152 ---------------------------------------
12155 Documentation: mention conflict marker size argument (%L) for merge driver
12156 rerere: fix memory leak if rerere images can't be read
12159 git-p4: fix bug in symlink handling
12162 Documentation: Fix indentation problem in git-commit(1)
12165 accept "git grep -- pattern"
12166 cherry-pick: rewrap advice message
12167 cherry-pick: refactor commit parsing code
12168 cherry-pick: format help message as strbuf
12169 cherry-pick: show commit name instead of sha1
12170 cherry-pick: prettify the advice message
12171 dwim_ref: fix dangling symref warning
12172 docs: don't talk about $GIT_DIR/refs/ everywhere
12173 rm: fix bug in recursive subdirectory removal
12176 t3301-notes: insert a shbang line in ./fake_editor.sh
12178 Jonathan Nieder (1):
12179 am: remove rebase-apply directory before gc
12181 Junio C Hamano (6):
12182 Typofixes outside documentation area
12183 Start 1.7.0 maintenance track
12184 Fix use of mutex in threaded grep
12185 Prepare 1.7.0.1 release notes
12186 Update 1.7.0.1 release notes
12190 diff: make sure --output=/bad/path is caught
12193 grep documentation: clarify what files match
12194 Remove reference to GREP_COLORS from documentation
12196 Markus Heidelberg (1):
12197 sha1_name: fix segfault caused by invalid index access
12200 commit: quote the user name in the example
12203 Remove hyphen from "git-command" in two error messages
12206 fix minor memory leak in get_tree_entry()
12209 Documentation: describe --thin more accurately
12212 stash pop: remove 'apply' options during 'drop' invocation
12213 t1450: fix testcases that were wrongly expecting failure
12216 Version v1.7.0; changes since v1.7.0-rc2:
12217 -----------------------------------------
12219 Brian Gernhardt (1):
12220 t3902: Protect against OS X normalization
12223 filter-branch: Fix error message for --prune-empty --commit-filter
12226 blame: prevent a segv when -L given start > EOF
12229 am: switch --resolved to --continue
12231 Junio C Hamano (11):
12232 git-add documentation: Fix shell quoting example
12233 Fix parsing of imap.preformattedHTML and imap.sslverify
12234 git-push: document all the status flags used in the output
12235 check-ref-format documentation: fix enumeration mark-up
12236 t8003: check exit code of command and error message separately
12238 Update draft release notes to 1.7.0 one more time
12239 archive documentation: attributes are taken from the tree by default
12240 Re-fix check-ref-format documentation mark-up
12241 Fix typo in 1.6.6.2 release notes
12244 Michael J Gruber (1):
12245 Documentation: minor fixes to RelNotes-1.7.0
12248 Revert "pack-objects: fix pack generation when using pack_size_limit"
12251 bash: support 'git am's new '--continue' option
12254 Documentation: quote braces in {upstream} notation
12257 Version v1.7.0-rc2; changes since v1.7.0-rc1:
12258 ---------------------------------------------
12261 git-svn: persistent memoization
12264 configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM
12265 configure: Allow --without-python
12267 Björn Gustavsson (1):
12268 bash: support the --autosquash option for rebase
12270 Brian Gernhardt (2):
12271 t9501: Skip testing load if we can't detect it
12272 t9501: Re-fix max load test
12274 Christian Stimming (1):
12275 git-gui: Update German translation (12 new or changed strings).
12278 Make NO_PTHREADS the sole thread configuration variable
12280 Emmanuel Trillaud (1):
12281 git-gui: update french translation
12283 Giuseppe Bilotta (4):
12284 git-gui: handle non-standard worktree locations
12285 git-gui: handle bare repos correctly
12286 git-gui: update shortcut tools to use _gitworktree
12287 git-gui: set GIT_DIR and GIT_WORK_TREE after setup
12290 git-gui: fix shortcut for menu "Commit/Revert Changes"
12292 Jakub Narębski (1):
12293 gitweb: Make running t9501 test with '--debug' reliable and usable
12296 git-gui: Support applying a range of changes at once
12299 mention new shell execution behavior in release notes
12300 docs: fix filter-branch example for quoted paths
12301 Fix invalid read in quote_c_style_counted
12304 git-gui: Use git diff --submodule when available
12305 git-gui: Add a special diff popup menu for submodules
12306 git-gui: Quote git path when starting another gui in a submodule
12307 Fix memory leak in submodule.c
12308 Updates for dirty submodules in release notes and user manual
12310 John 'Warthog9' Hawley (7):
12311 gitweb: Load checking
12312 gitweb: Makefile improvements
12313 gitweb: Check that $site_header etc. are defined before using them
12314 gitweb: add a "string" variant of print_local_time
12315 gitweb: add a "string" variant of print_sort_th
12316 gitweb: Add optional extra parameter to die_error, for extended explanation
12317 gitweb: Simplify (and fix) chop_str
12319 Junio C Hamano (7):
12320 RPM packaging: use %global inside %{!?...}
12321 Update draft release notes to 1.7.0
12322 build: make code "-Wpointer-arith" clean
12323 fast-import.c: Fix big-file-threshold parsing bug
12324 fast-import: count --max-pack-size in bytes
12325 Revert 30816237 and 7e62265
12326 Update draft release notes to 1.7.0
12328 Michael J Gruber (1):
12329 git-clean: fix the description of the default behavior
12332 filter-branch: Fix to allow replacing submodules with another content
12333 filter-branch: Add tests for submodules in tree-filter
12335 Michele Ballabio (1):
12336 git-gui: update Italian translation
12338 Nanako Shiraishi (1):
12339 git-gui: update Japanese translation
12342 fix multiple issues with t5300
12343 pack-objects: fix pack generation when using pack_size_limit
12344 make --max-pack-size argument to 'git pack-object' count in bytes
12345 update git-repack documentation wrt repack.UseDeltaBaseOffset
12347 Pal-Kristian Engstad (1):
12348 git-p4: Fix sync errors due to new server version
12351 git-gui: use themed tk widgets with Tk 8.5
12353 Paul Mackerras (1):
12354 gitk: Fix copyright symbol in About box message
12356 Peter Krefting (1):
12357 git-gui: Update Swedish translation (520t0f0u)
12359 Peter Oberndorfer (1):
12360 git-gui: use different icon for new and modified files in the index
12362 Ralf Wildenhues (1):
12363 Fix typos in technical documentation.
12366 grep: simplify assignment of ->fixed
12367 archive: simplify archive format guessing
12369 Shawn O. Pearce (4):
12370 git-gui: Remove unused icon file_parttick
12371 git-gui: Update translation template
12372 fast-import: Stream very large blobs directly to pack
12373 Correct spelling of 'REUC' extension
12375 Wesley J. Landaker (1):
12376 Update git fsck --full short description to mention packs
12379 Version v1.7.0-rc1; changes since v1.7.0-rc0:
12380 ---------------------------------------------
12382 Alejandro Riveira Fernández (1):
12383 Add test-run-command to .gitignore
12385 Benjamin Kramer (1):
12386 grep: use REG_STARTEND (if available) to speed up regexec
12388 Christian Couder (1):
12389 gitk: Add "--no-replace-objects" option
12391 Christian Stimming (1):
12392 gitk: Update German translation
12395 grep: Fix two memory leaks
12398 gitk: Enable gitk to create tags with messages
12399 gitk: Fix display of newly-created tags
12401 Emmanuel Trillaud (1):
12402 gitk: Add French translation
12404 Fredrik Kuivinen (1):
12408 git-cvsserver: allow regex metacharacters in CVSROOT
12410 Ilari Liusvaara (7):
12411 Support addresses with ':' in git-daemon
12412 Allow use of []-wrapped addresses in git://
12414 Fix integer overflow in patch_delta()
12415 Fix integer overflow in unpack_sha1_rest()
12416 Fix integer overflow in unpack_compressed_entry()
12417 Fix remote.<remote>.vcs
12420 t0101: use absolute date
12421 rerere: fix too-short initialization
12422 test combinations of @{} syntax
12423 fix parsing of @{-1}@{u} combination
12424 reject @{-1} not at beginning of object name
12425 fix memcpy of overlapping area
12426 fix off-by-one allocation error
12427 add shebang line to git-mergetool--lib.sh
12430 git diff: Don't test submodule dirtiness with --ignore-submodules
12431 Teach diff --submodule that modified submodule directory is dirty
12434 builtin-config: Fix crash when using "-f <relative path>" from non-root dir
12437 git_connect: use use_shell instead of explicit "sh", "-c"
12438 Implement pthread_cond_broadcast on Windows
12440 Junio C Hamano (13):
12441 Make ce_uptodate() trustworthy again
12442 grep: expose "status-only" feature via -q
12443 Fix log -g this@{upstream}
12444 approxidate_careful() reports errorneous date string
12445 work around an obnoxious bash "safety feature" on OpenBSD
12446 Update @{bogus.timestamp} fix not to die()
12447 t0101: use a fixed timestamp when searching in the reflog
12448 transport_get(): drop unnecessary check for !remote
12449 tests: update tests that used to fail
12450 grep --quiet: finishing touches
12451 Update draft release notes to 1.7.0
12452 RPM packaging: don't include foreign-scm-helper bits yet
12453 is_submodule_modified(): fix breakage with external GIT_INDEX_FILE
12455 Kirill Smelkov (1):
12456 gitk: Display submodule diffs with appropriate encoding
12459 gitk: Add Hungarian translation
12461 Markus Heidelberg (2):
12462 gitk: Adjust two equal strings which differed in whitespace
12463 rebase: don't invoke the pager for each commit summary
12465 Michele Ballabio (1):
12466 gitk: update Italian translation
12469 gitk: Update Hungarian translation
12471 Peter Krefting (1):
12472 gitk: Update Swedish translation
12475 bash: don't offer remote transport helpers as subcommands
12476 bash: support 'git notes' and its subcommands
12478 Sebastian Schuberth (1):
12479 If deriving SVN_SSH from GIT_SSH on msys, also add quotes
12482 rebase: replace antiquated sed invocation
12483 commit-tree: remove unused #define
12484 tests: consolidate CR removal/addition functions
12485 t0022: replace non-portable literal CR
12486 am: fix patch format detection for Thunderbird "Save As" emails
12487 fix portability issues with $ in double quotes
12490 t5541-http-push: make grep expression check for one line only
12493 Version v1.7.0-rc0; changes since v1.6.6.3:
12494 -------------------------------------------
12496 Andreas Gruenbacher (2):
12497 builtin-apply.c: Skip filenames without enough components
12498 builtin-apply.c: fix the --- and +++ header filename consistency check
12501 git-svn: ignore changeless commits when checking for a cherry-pick
12502 git-svn: handle merge-base failures
12503 git-svn: update svn mergeinfo test suite
12505 Andrzej K. Haczewski (1):
12506 MSVC: Windows-native implementation for subset of Pthreads API
12508 Avery Pennarun (3):
12509 git merge -X<option>
12510 Teach git-pull to pass -X<option> to git-merge
12511 Extend merge-subtree tests to test -Xsubtree=dir.
12513 Bart Trojanowski (1):
12514 hg-to-git: fix COMMITTER type-o
12517 cvsimport: modernize callouts to git subcommands
12518 cvsimport: standarize open() calls to external git tools
12519 cvsimport: standarize system() calls to external git tools
12522 Test update-index for a gitlink to a .git file
12523 Handle relative paths in submodule .git files
12525 Christian Couder (8):
12526 reset: improve mixed reset error message when in a bare repo
12527 Documentation: reset: add some tables to describe the different options
12528 reset: add a few tests for "git reset --merge"
12529 Documentation: reset: add some missing tables
12530 t7111: check that reset options work as described in the tables
12531 help: fix configured help format taking over command line one
12532 t7111: fix bad HEAD in tests with unmerged entries
12533 Documentation: rev-list: fix synopsys for --tags and and --remotes
12535 Daniel Barkalow (9):
12536 Fix memory leak in helper method for disconnect
12537 Allow programs to not depend on remotes having urls
12538 Use a function to determine whether a remote is valid
12539 Allow fetch to modify refs
12540 Add a config option for remotes to specify a foreign vcs
12541 Add support for "import" helper command
12542 Allow helper to map private ref names into normal names
12543 Allow helpers to report in "list" command that the ref is unchanged
12544 Replace parse_blob() with an explanatory comment
12546 David Aguilar (11):
12547 t7800-difftool: Set a bogus tool for use by tests
12548 git-difftool: Add '--gui' for selecting a GUI tool
12549 difftool--helper: Update copyright and remove distracting comments
12550 difftool--helper: Remove use of the GIT_MERGE_TOOL variable
12551 difftool: Allow specifying unconfigured commands with --extcmd
12552 git-diff.txt: Link to git-difftool
12553 t7800-difftool.sh: Simplify the --extcmd test
12554 difftool: Add '-x' and as an alias for '--extcmd'
12555 difftool: Use eval to expand '--extcmd' expressions
12556 difftool: Update copyright notices to list each year separately
12557 t7800-difftool.sh: Test mergetool.prompt fallback
12559 Erik Faye-Lund (2):
12560 daemon: consider only address in kill_some_child()
12561 Windows: disable Python
12563 Felipe Contreras (1):
12564 General --quiet improvements
12567 No diff -b/-w output for all-whitespace changes
12569 Horst H. von Brand (1):
12570 git-rebase.txt: Fix spelling
12573 git-svn: fix mismatched src/dst errors for branch/tag
12574 git-svn: respect commiturl option for branch/tag
12575 git-svn: add --username/commit-url options for branch/tag
12576 git-svn: document --username/commit-url for branch/tag
12578 Ilari Liusvaara (15):
12579 Add remote helper debug mode
12580 Support mandatory capabilities
12581 Pass unknown protocols to external protocol handlers
12582 Refactor git transport options parsing
12583 Support taking over transports
12584 Support remote helpers implementing smart transports
12585 Support remote archive from all smart transports
12586 Remove special casing of http, https and ftp
12587 Reset possible helper before reusing remote structure
12588 Improve error message when a transport helper was not found
12589 Add push --set-upstream
12590 Add git remote set-url
12591 Add branch --set-upstream
12593 rev-parse --branches/--tags/--remotes=pattern
12595 Jakub Narębski (1):
12596 gitweb.js: Workaround for IE8 bug
12598 James P. Howard, II (1):
12599 commit: support commit.status, --status, and --no-status
12602 builtin-push: add --delete as syntactic sugar for :foo
12605 git-svn: allow UUID to be manually remapped via rewriteUUID
12606 git-svn: allow subset of branches/tags to be specified in glob spec
12609 status: typo fix in usage
12610 status: refactor short-mode printing to its own function
12611 status: refactor format option parsing
12612 status: add --porcelain output format
12613 commit: support alternate status formats
12614 docs: note that status configuration affects only long format
12615 tests: rename duplicate t1009
12616 status: disable color for porcelain format
12617 status: reduce duplicated setup code
12618 tests: handle NO_PYTHON setting
12619 run-command: add "use shell" option
12620 run-command: convert simple callsites to use_shell
12621 run-command: optimize out useless shell calls
12622 editor: use run_command's shell feature
12623 textconv: use shell to run helper
12624 diff: run external diff helper with shell
12625 strbuf_expand: convert "%%" to "%"
12626 strbuf: add strbuf_addbuf_percentquote
12627 commit: show interesting ident information in summary
12628 commit: allow suppression of implicit identity advice
12631 Show submodules as modified when they contain a dirty work tree
12632 git status: Show uncommitted submodule changes too when enabled
12633 Performance optimization for detection of modified submodules
12636 diff.c: fix typoes in comments
12639 Basic build infrastructure for Python scripts
12640 fast-import: Proper notes tree manipulation
12641 Rename t9301 to t9350, to make room for more fast-import tests
12642 Add more testcases to test fast-import of notes
12644 Johannes Schindelin (2):
12645 Allow specifying the remote helper in the url
12646 Introduce <branch>@{upstream} notation
12648 Johannes Sixt (16):
12649 Make test case number unique
12650 filter-branch: remove an unnecessary use of 'git read-tree'
12651 t0021: use $SHELL_PATH for the filter script
12652 t4030, t4031: work around bogus MSYS bash path conversion
12653 start_command: report child process setup errors to the parent's stderr
12654 run-command: move wait_or_whine earlier
12655 start_command: detect execvp failures early
12656 Windows: boost startup by avoiding a static dependency on shell32.dll
12657 Windows: simplify the pipe(2) implementation
12658 Windows: avoid the "dup dance" when spawning a child process
12659 Do not use date.c:tm_to_time_t() from compat/mingw.c
12660 Makefile: honor NO_CURL when setting REMOTE_CURL_* variables
12661 Make test case numbers unique
12662 Make 'rerere forget' work from a subdirectory.
12663 merge-tree: remove unnecessary call of git_extract_argv0_path
12664 Make test numbers unique
12666 Jonathan Nieder (15):
12667 Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGS
12668 Makefile: regenerate assembler listings when asked
12669 Makefile: use target-specific variable to pass flags to cc
12670 Makefile: learn to generate listings for targets requiring special flags
12671 Makefile: consolidate .FORCE-* targets
12672 Documentation: git gc packs refs by default now
12673 Documentation: tiny git config manual tweaks
12674 Documentation: merge: move configuration section to end
12675 Documentation: suggest `reset --merge` in How Merge Works section
12676 Documentation: merge: move merge strategy list to end
12677 Documentation: merge: add an overview
12678 Documentation: emphasize when git merge terminates early
12679 Documentation: merge: add a section about fast-forward
12680 Documentation: simplify How Merge Works
12681 Documentation: merge: use MERGE_HEAD to refer to the remote branch
12683 Junio C Hamano (96):
12684 Refuse updating the current branch in a non-bare repository via push
12685 Refuse deleting the current branch via push
12686 diff: change semantics of "ignore whitespace" options
12687 diff: Rename QUIET internal option to QUICK
12688 git stat: the beginning of "status that is not a dry-run of commit"
12689 git stat -s: short status output
12690 git status: not "commit --dry-run" anymore
12691 send-email: make --no-chain-reply-to the default
12692 "checkout A...B" switches to the merge base between A and B
12693 "rebase --onto A...B" replays history on the merge base between A and B
12694 git-merge-file --ours, --theirs
12695 Teach --[no-]rerere-autoupdate option to merge, revert and friends
12696 commit/status: check $GIT_DIR/MERGE_HEAD only once
12697 commit/status: "git add <path>" is not necessarily how to resolve
12698 status/commit: do not suggest "reset HEAD <path>" while merging
12699 builtin-merge.c: use standard active_cache macros
12700 resolve-undo: record resolved conflicts in a new index extension section
12701 resolve-undo: basic tests
12702 resolve-undo: allow plumbing to clear the information
12703 resolve-undo: "checkout -m path" uses resolve-undo information
12704 resolve-undo: teach "update-index --unresolve" to use resolve-undo info
12705 rerere: remove silly 1024-byte line limit
12706 Kick off 1.7.0 cycle
12707 Remove http.authAny
12708 branch -d: base the "already-merged" safety on the branch it merges with
12709 "reset --merge": fix unmerged case
12710 tests: move convenience regexp to match object names to test-lib.sh
12711 more D/F conflict tests
12712 traverse_trees(): handle D/F conflict case sanely
12713 Aggressive three-way merge: fix D/F case
12714 Fix bit assignment for CE_CONFLICTED
12715 .gitattributes: detect 8-space indent in shell scripts
12716 unpack-trees.c: prepare for looking ahead in the index
12717 unpack-trees.c: look ahead in the index
12718 read-tree --debug-unpack
12719 Describe second batch for 1.7.0 in draft release notes
12720 ident.c: remove unused variables
12721 t3001: test ls-files -o ignored/dir
12722 read_directory_recursive(): refactor handling of a single path into a separate function
12723 read_directory(): further split treat_path()
12724 ls-files: fix overeager pathspec optimization
12725 ident.c: check explicit identity for name and email separately
12726 ident.c: treat $EMAIL as giving user.email identity explicitly
12727 rerere: refactor rerere logic to make it independent from I/O
12728 rerere forget path: forget recorded resolution
12729 bisect.c: mark file-local function static
12730 builtin-rev-list.c: mark file-local function static
12731 pretty.c: mark file-local function static
12732 grep: optimize built-in grep by skipping lines that do not hit
12733 http.c: mark file-local functions static
12734 entry.c: mark file-local function static
12735 parse-options.c: mark file-local function static
12736 read-cache.c: mark file-local functions static
12737 remote-curl.c: mark file-local function static
12738 quote.c: mark file-local function static
12739 submodule.c: mark file-local function static
12740 utf8.c: mark file-local function static
12741 mailmap.c: remove unused function
12742 sha1_file.c: remove unused function
12743 strbuf.c: remove unused function
12744 grep: rip out support for external grep
12745 grep: rip out pessimization to use fixmatch()
12746 t7502: test commit.status, --status and --no-status
12747 strbuf_addbuf(): allow passing the same buf to dst and src
12748 grep: prepare to run outside of a work tree
12749 grep --no-index: allow use of "git grep" outside a git repository
12750 Teach diff that modified submodule directory is dirty
12751 git_attr(): fix function signature
12752 xdl_merge(): introduce xmparam_t for merge specific parameters
12753 xdl_merge(): allow passing down marker_size in xmparam_t
12754 merge-tree: use ll_merge() not xdl_merge()
12755 rerere: use ll_merge() instead of using xdl_merge()
12756 conflict-marker-size: new attribute
12757 commit.c::print_summary: do not release the format string too early
12758 rerere: prepare for customizable conflict marker length
12759 rerere: honor conflict-marker-size attribute
12760 user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
12761 user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
12762 Update COPYING with GPLv2 with new FSF address
12763 Update draft release notes to 1.7.0
12764 pull: Fix parsing of -X<option>
12765 Make "subtree" part more orthogonal to the rest of merge-recursive.
12766 Document that merge strategies can now take their own options
12767 object.c: remove unused functions
12768 symlinks.c: remove unused functions
12769 Update draft release notes to 1.7.0
12770 Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
12771 t1506: more test for @{upstream} syntax
12772 Teach @{upstream} syntax to strbuf_branchanme()
12773 date.c: mark file-local function static
12774 Update draft release notes to 1.7.0
12775 conflict-marker-size: add test and docs
12776 git-mv: fix moving more than one source to a single destination
12777 Update draft release notes to 1.7.0
12778 rebase -i: Export GIT_AUTHOR_* variables explicitly
12779 pull: re-fix command line generation
12781 Linus Torvalds (11):
12782 Remove diff machinery dependency from read-cache
12783 slim down "git show-index"
12784 make "git merge-tree" a built-in
12785 make "git hash-object" a built-in
12786 make "git var" a built-in
12787 make "git patch-id" a built-in
12788 make "merge-index" a built-in
12789 make "mktag" a built-in
12790 make "git unpack-file" a built-in
12791 make "git pack-redundant" a built-in
12792 make "index-pack" a built-in
12794 Martin Storsjö (2):
12795 Add an option for using any HTTP authentication scheme, not only basic
12796 Allow curl to rewind the RPC read buffer
12798 Matthew Ogilvie (3):
12799 build dashless "bin-wrappers" directory similar to installed bindir
12800 run test suite without dashed git-commands in PATH
12801 INSTALL: document a simpler way to run uninstalled builds
12804 Detailed diagnosis when parsing an object name fails.
12805 builtin-config: add --path option doing ~ and ~user expansion.
12806 push: spell 'Note about fast-forwards' section name correctly in error message.
12807 Be more user-friendly when refusing to do something because of conflict.
12808 lockfile: show absolute filename in unable_to_lock_message
12809 branch: warn and refuse to set a branch as a tracking branch of itself.
12811 Michael Haggerty (25):
12812 t3404: Use test_commit to set up test repository
12813 Add a command "fixup" to rebase --interactive
12814 lib-rebase: Provide clearer debugging info about what the editor did
12815 lib-rebase: Allow comments and blank lines to be added to the rebase script
12816 rebase-i: Ignore comments and blank lines in peek_next_command
12817 rebase -i: Make the condition for an "if" more transparent
12818 rebase -i: Remove dead code
12819 rebase -i: Inline expression
12820 rebase -i: Use "test -n" instead of "test ! -z"
12821 rebase -i: Use symbolic constant $MSG consistently
12822 rebase -i: Document how temporary files are used
12823 rebase -i: Introduce a constant AUTHOR_SCRIPT
12824 rebase -i: Introduce a constant AMEND
12825 t3404: Test the commit count in commit messages generated by "rebase -i"
12826 rebase -i: Improve consistency of commit count in generated commit messages
12827 rebase -i: Simplify commit counting for generated commit messages
12828 rebase -i: Extract a function "commit_message"
12829 rebase -i: Handle the author script all in one place in do_next
12830 rebase -i: Extract function do_with_author
12831 rebase -i: Change function make_squash_message into update_squash_message
12832 rebase -i: For fixup commands without squashes, do not start editor
12833 t3404: Set up more of the test repo in the "setup" step
12834 rebase -i: Retain user-edited commit messages after squash/fixup conflicts
12835 rebase -i: Avoid non-portable "test X -a Y"
12836 rebase -i: Enclose sed command substitution in quotes
12838 Michael J Gruber (7):
12839 status -s: respect the status.relativePaths option
12840 t7508-status.sh: Add tests for status -s
12841 builtin-commit: refactor short-status code into wt-status.c
12842 status -s: obey color.status
12843 t7508-status: status --porcelain ignores relative paths setting
12844 t7508-status: test all modes with color
12845 tag -d: print sha1 of deleted tag
12847 Michael Lukashov (1):
12848 Windows: Remove dependency on pthreadGC2.dll
12851 builtin-commit: add --date option
12852 Document date formats accepted by parse_date()
12854 Nanako Shiraishi (3):
12855 rebase -i --autosquash: auto-squash commits
12856 rebase: fix --onto A...B parsing and add tests
12857 rebase -i: teach --onto A...B syntax
12859 Nguyễn Thái Ngọc Duy (27):
12860 update-index: refactor mark_valid() in preparation for new options
12861 Add test-index-version
12862 Introduce "skip-worktree" bit in index, teach Git to get/set this bit
12863 Teach Git to respect skip-worktree bit (reading part)
12864 Teach Git to respect skip-worktree bit (writing part)
12865 Avoid writing to buffer in add_excludes_from_file_1()
12866 Read .gitignore from index if it is skip-worktree
12867 unpack-trees(): carry skip-worktree bit over in merged_entry()
12868 excluded_1(): support exclude files in index
12869 dir.c: export excluded_1() and add_excludes_from_file_1()
12870 Introduce "sparse checkout"
12871 unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
12872 unpack-trees.c: generalize verify_* functions
12873 unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
12874 unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
12875 unpack-trees(): ignore worktree check outside checkout area
12876 read-tree: add --no-sparse-checkout to disable sparse checkout support
12877 Add tests for sparse checkout
12878 sparse checkout: inhibit empty worktree
12879 ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
12880 commit: correctly respect skip-worktree bit
12881 grep: do not do external grep on skip-worktree entries
12882 t7002: set test prerequisite "external-grep" if supported
12883 t7002: test for not using external grep on skip-worktree paths
12884 status: only touch path we may need to check
12885 rm: only refresh entries that we may touch
12886 Fix memory corruption when .gitignore does not end by \n
12889 fix git-p4 editor invocation
12891 Peter Collingbourne (1):
12892 Remove empty directories when checking out a commit with fewer submodules
12895 CVS Server: Support reading base and roots from environment
12897 Ramkumar Ramachandra (1):
12898 Documentation: Update git core tutorial clarifying reference to scripts
12900 Ramsay Allan Jones (5):
12901 MSVC: Fix an "incompatible pointer types" compiler warning
12902 engine.pl: Fix a recent breakage of the buildsystem generator
12903 msvc: Fix an "unrecognized option" linker warning
12904 msvc: Fix a compiler warning due to an incorrect pointer cast
12905 msvc: Add a definition of NORETURN compatible with msvc compiler
12908 Add completion for git-svn mkdirs,reset,and gc
12910 Sebastian Schuberth (1):
12911 Make difftool.prompt fall back to mergetool.prompt
12913 Sergei Organov (1):
12914 cvsserver: make the output of 'update' more compatible with cvs.
12916 Shawn O. Pearce (1):
12917 bash completion: add space between branch name and status flags
12920 reset: use "unpack_trees()" directly instead of "git read-tree"
12923 Add 'git rev-parse --show-toplevel' option.
12924 Use $(git rev-parse --show-toplevel) in cd_to_toplevel().
12926 Sverre Rabbelier (9):
12927 Fix various memory leaks in transport-helper.c
12928 Add Python support library for remote helpers
12929 fast-import: put option parsing code in separate functions
12930 fast-import: put marks reading in its own function
12931 fast-import: add feature command
12932 fast-import: add option command
12933 fast-import: test the new option command
12934 fast-import: allow for multiple --import-marks= arguments
12935 fast-import: add (non-)relative-marks feature
12937 Tarmigan Casebolt (7):
12938 t/lib-http.sh: Restructure finding of default httpd location
12939 Smart-http: check if repository is OK to export before serving it
12940 Smart-http tests: Improve coverage in test t5560
12941 Smart-http tests: Break test t5560-http-backend into pieces
12942 Smart-http tests: Test http-backend without curl or a webserver
12943 Test t5560: Fix test when run with dash
12944 ident.c: replace fprintf with fputs to suppress compiler warning
12946 Tay Ray Chuan (12):
12947 http: maintain curl sessions
12948 builtin-push: don't access freed transport->url
12949 check stderr with isatty() instead of stdout when deciding to show progress
12950 git-clone.txt: reword description of progress behaviour
12951 clone: set transport->verbose when -v/--verbose is used
12952 clone: use --progress to force progress reporting
12953 t5541-http-push.sh: add tests for non-fast-forward pushes
12954 t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
12955 refactor ref status logic for pushing
12956 transport.c::transport_push(): make ref status affect return value
12957 transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
12958 transport-helper.c::push_refs(): emit "no refs" error message
12961 Use warning function instead of fprintf(stderr, "Warning: ...").
12962 string-list: rename the include guard to STRING_LIST_H
12965 Documentation/git-merge: reword references to "remote" and "pull"
12966 Documentation: warn prominently against merging with dirty trees
12967 Documentation: format full commands in typewriter font
12968 Documentation: spell 'git cmd' without dash throughout
12969 Documentation: show-files is now called git-ls-files
12970 Documentation: emphasise 'git shortlog' in its synopsis
12971 Documentation: improve description of --glob=pattern and friends
12972 Documentation: add missing :: in config.txt
12973 Documentation: move away misplaced 'push --upstream' description
12976 Version v1.6.6.3; changes since v1.6.6.2:
12977 -----------------------------------------
12979 Christian Couder (1):
12980 bisect: error out when passing bad path parameters
12982 Erik Faye-Lund (1):
12983 run-command: support custom fd-set in async
12985 Gabriel Filion (1):
12986 require_work_tree broken with NONGIT_OK
12989 Check size of path buffer before writing into it
12991 Hitoshi Mitake (1):
12992 git-imap-send: Convert LF to CRLF before storing patch to draft box
12995 filter-branch: Fix error message for --prune-empty --commit-filter
12997 Jakub Narębski (1):
12998 gitweb: Introduce esc_attr to escape attributes of HTML elements
13001 dwim_ref: fix dangling symref warning
13002 rm: fix bug in recursive subdirectory removal
13005 t3301-notes: insert a shbang line in ./fake_editor.sh
13006 MSVC: Fix build by adding missing termios.h dummy
13008 Junio C Hamano (5):
13009 t6000lib: Fix permission
13010 lib-patch-mode.sh: Fix permission
13011 Re-fix check-ref-format documentation mark-up
13012 Fix typo in 1.6.6.2 release notes
13016 diff: make sure --output=/bad/path is caught
13018 Michael J Gruber (4):
13019 Documentation/git-reflog: Fix formatting of command lists
13020 Documentation/gitdiffcore: Remove misleading date in heading
13021 Documentation/urls: Remove spurious example markers
13022 Documentation/git-clone: Transform description list into item list
13025 Remove extra '-' from git-am(1)
13028 Remove hyphen from "git-command" in two error messages
13031 fix minor memory leak in get_tree_entry()
13032 utf8.c: remove print_wrapped_text()
13033 utf8.c: remove print_spaces()
13034 utf8.c: remove strbuf_write()
13035 utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
13037 Shawn O. Pearce (7):
13038 run-command: Allow stderr to be a caller supplied pipe
13039 send-pack: demultiplex a sideband stream with status data
13040 receive-pack: Refactor how capabilities are shown to the client
13041 receive-pack: Wrap status reports inside side-band-64k
13042 receive-pack: Send hook output over side band #2
13043 t5401: Use a bare repository for the remote peer
13044 receive-pack: Send internal errors over side-band #2
13047 request-pull.txt: Document -p option
13050 stash pop: remove 'apply' options during 'drop' invocation
13051 cherry_pick_list: quit early if one side is empty
13053 Uwe Kleine-König (1):
13054 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
13057 Version v1.6.6.2; changes since v1.6.6.1:
13058 -----------------------------------------
13060 Christopher Beelby (1):
13061 git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync
13064 git-cvsserver: allow regex metacharacters in CVSROOT
13066 Giuseppe Bilotta (1):
13067 git-gui: work from the .git dir
13069 Ilari Liusvaara (4):
13071 Fix integer overflow in patch_delta()
13072 Fix integer overflow in unpack_sha1_rest()
13073 Fix integer overflow in unpack_compressed_entry()
13076 blame: prevent a segv when -L given start > EOF
13079 git-gui: Fix applying a line when all following lines are deletions
13082 fix memcpy of overlapping area
13085 git-gui: Correct file_states when unstaging partly staged entry
13088 builtin-config: Fix crash when using "-f <relative path>" from non-root dir
13090 Jonathan Nieder (1):
13091 git-gui: Makefile: consolidate .FORCE-* targets
13093 Junio C Hamano (15):
13094 checkout -m path: fix recreating conflicts
13095 status: don't require the repository to be writable
13096 Fix "log" family not to be too agressive about showing notes
13097 Fix "log --oneline" not to show notes
13098 merge-recursive: do not return NULL only to cause segfault
13099 ignore duplicated slashes in make_relative_path()
13100 approxidate_careful() reports errorneous date string
13101 Update @{bogus.timestamp} fix not to die()
13102 t0101: use a fixed timestamp when searching in the reflog
13103 git-add documentation: Fix shell quoting example
13104 Fix parsing of imap.preformattedHTML and imap.sslverify
13105 git-push: document all the status flags used in the output
13106 check-ref-format documentation: fix enumeration mark-up
13107 t8003: check exit code of command and error message separately
13110 Nguyễn Thái Ngọc Duy (1):
13111 Add missing #include to support TIOCGWINSZ on Solaris
13114 git-gui: handle really long error messages in updateindex.
13116 Peter Krefting (1):
13117 git-gui: Fix gitk for branch whose name matches local file
13120 archive: complain about path specs that don't match anything
13121 archive: simplify archive format guessing
13124 bash: don't offer remote transport helpers as subcommands
13126 Shawn O. Pearce (1):
13127 fast-import: Stream very large blobs directly to pack
13130 retry request without query when info/refs?query fails
13132 Vitaly "_Vi" Shukela (1):
13133 git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"
13135 Wesley J. Landaker (1):
13136 Update git fsck --full short description to mention packs
13139 Version v1.6.6.1; changes since v1.6.6:
13140 ---------------------------------------
13142 Andreas Gruenbacher (3):
13143 base85 debug code: Fix length byte calculation
13144 base85: encode_85() does not use the decode table
13145 base85: Make the code more obvious instead of explaining the non-obvious
13147 Andreas Schwab (1):
13148 git count-objects: handle packs bigger than 4G
13150 Björn Gustavsson (4):
13151 Documentation: 'git add -A' can remove files
13152 git-add/rm doc: Consistently back-quote
13153 Fix "git remote update" with remotes.defalt set
13154 git-rm doc: Describe how to sync index & work tree
13157 bisect: fix singular/plural grammar nit
13159 Dmitry Potapov (1):
13160 fast-import: tag may point to any object type
13163 commit: --cleanup is a message option
13166 reset: unbreak hard resets with GIT_WORK_TREE
13167 textconv: stop leaking file descriptors
13170 grep: NUL terminate input from a file
13172 Jonathan Nieder (2):
13173 Documentation: git gc packs refs by default now
13174 Documentation: tiny git config manual tweaks
13176 Junio C Hamano (10):
13177 t1200: work around a bug in some implementations of "find"
13178 t4019 "grep" portability fix
13179 Start 1.6.6.X maintenance track
13180 Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV
13181 checkout -m: do not try to fall back to --merge from an unborn branch
13182 grep: -L should show empty files
13183 Update draft release notes to 1.6.6.1
13184 Fix mis-backport of t7002
13189 SubmittingPatches: hints to know the status of a submitted patch.
13190 branch: die explicitly why when calling "git branch [-a|-r] branchname".
13191 stash: mention --patch in usage string.
13193 Michael Haggerty (1):
13194 rebase--interactive: Ignore comments and blank lines in peek_next_command
13196 Nathaniel W Filardo (1):
13197 read_index(): fix reading extension size on BE 64-bit archs
13199 Nguyễn Thái Ngọc Duy (2):
13200 Documentation: always respect core.worktree if set
13201 t7102: make the test fail if one of its check fails
13203 Ramkumar Ramachandra (1):
13204 Document git-blame triple -C option
13206 Richard Weinberger (1):
13207 Fix uninitialized variable in get_refs_via_rsync().
13209 Shawn O. Pearce (2):
13210 fast-import: Document author/committer/tagger name is optional
13211 remote-curl: Fix Accept header for smart HTTP connections
13214 octopus: make merge process simpler to follow
13215 octopus: reenable fast-forward merges
13216 octopus: remove dead code
13218 Tarmigan Casebolt (1):
13219 Add git-http-backend to command-list.
13222 bash completion: factor submodules into dirty state
13225 Version v1.6.6; changes since v1.6.6-rc4:
13226 -----------------------------------------
13229 git-svn: Remove obsolete MAXPARENT check
13232 Prevent git blame from segfaulting on a missing author name
13235 git svn: fix --revision when fetching deleted paths
13236 update release notes for git svn in 1.6.6
13237 git svn: lookup new parents correctly from svn:mergeinfo
13238 git svn: branch/tag commands detect username in URLs
13240 Junio C Hamano (1):
13244 git svn: add test for a git svn gc followed by a git svn mkdirs
13247 git-svn: expand the svn mergeinfo test suite, highlighting some failures
13248 git-svn: memoize conversion of SVN merge ticket info to git commit ranges
13249 git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges
13250 git-svn: exclude already merged tips using one rev-list call
13251 git-svn: detect cherry-picks correctly.
13254 Version v1.6.6-rc4; changes since v1.6.6-rc3:
13255 ---------------------------------------------
13257 Björn Gustavsson (1):
13258 rebase -i: abort cleanly if the editor fails to launch
13261 git svn: make empty directory creation gc-aware
13262 t9146: use 'svn_cmd' wrapper
13264 Junio C Hamano (1):
13268 api-strbuf.txt: fix typos and document launch_editor()
13269 technical-docs: document hash API
13272 Version v1.6.6-rc3; changes since v1.6.6-rc2:
13273 ---------------------------------------------
13275 Björn Gustavsson (1):
13276 bash: Support new 'git fetch' options
13279 ignore unknown color configuration
13282 help.autocorrect: do not run a command if the command given is junk
13284 Junio C Hamano (7):
13285 Remove post-upload-hook
13286 Fix archive format with -- on the command line
13288 Update Release Notes for 1.6.6 to remove old bugfixes
13289 worktree: don't segfault with an absolute pathspec without a work tree
13293 Nanako Shiraishi (1):
13294 Illustrate "filter" attribute with an example
13297 Version v1.6.6-rc2; changes since v1.6.6-rc1:
13298 ---------------------------------------------
13301 git-svn: sort svk merge tickets to account for minimal parents
13302 git-svn: Set svn.authorsfile to an absolute path when cloning
13303 git-svn: set svn.authorsfile earlier when cloning
13305 Alexander Gavrilov (1):
13306 git-gui: Increase blame viewer usability on MacOS.
13309 gitk: Skip translation of "wrong Tcl version" message
13312 t4201: use ISO8859-1 rather than ISO-8859-1
13313 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
13315 Clemens Buchacher (1):
13316 git-gui: search 4 directories to improve statistic of gc hint
13319 git svn: log removals of empty directories
13322 git svn: Don't create empty directories whose parents were deleted
13324 Guillermo S. Romero (1):
13325 gitk: Add configuration for UI colour scheme
13328 git gui: make current branch default in "remote delete branch" merge check
13330 Jakub Narębski (1):
13331 gitweb: Describe (possible) gitweb.js minification in gitweb/README
13334 pull: clarify advice for the unconfigured error case
13337 rerere: don't segfault on failure to open rr-cache
13338 reset: improve worktree safety valves
13339 add-interactive: fix deletion of non-empty files
13342 gitk: Fix diffing committed -> staged (typo in diffcmd)
13343 gitk: Use the --submodule option for displaying diffs when available
13345 Jindrich Makovicka (1):
13346 git-gui: suppress RenderBadPicture X error caused by Tk bug
13349 Fix crasher on encountering SHA1-like non-note in notes tree
13351 Junio C Hamano (9):
13352 Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make
13353 Unconditionally set man.base.url.for.relative.links
13355 Documentation: xmlto 0.0.18 does not know --stringparam
13356 Prepare for 1.6.5.5
13358 Revert recent "git merge <msg> HEAD <commit>..." deprecation
13359 Update draft release notes to 1.6.6 before -rc2
13362 Linus Torvalds (1):
13363 Fix diff -B/--dirstat miscounting of newly added contents
13365 Markus Heidelberg (1):
13366 gitk: Fix "git gui blame" invocation when called from top-level directory
13369 gitk: Add Japanese translation
13370 gitk: Update Japanese translation
13373 gitk: Use themed tk widgets
13374 gitk: Fix errors in the theme patch
13375 gitk: Default to the system colours on Windows
13376 gitk: Fix selection of tags
13378 Paul Mackerras (5):
13379 gitk: Restore scrolling position of diff pane on back/forward in history
13380 gitk: Add a user preference to enable/disable use of themed widgets
13381 gitk: Show diff of commits at end of compare-commits output
13382 gitk: Don't compare fake children when comparing commits
13383 gitk: Improve appearance of radiobuttons and checkbuttons
13386 archive: clarify description of path parameter
13389 bash: update 'git commit' completion
13391 Sitaram Chamarty (1):
13392 gitk: Disable checkout of remote branches
13394 Todd Zullinger (1):
13395 Documentation: Avoid use of xmlto --stringparam
13398 Version v1.6.6-rc1; changes since v1.6.6-rc0:
13399 ---------------------------------------------
13401 Avery Pennarun (1):
13402 builtin-merge.c: call exclude_cmds() correctly.
13404 Benjamin Kramer (1):
13405 Explicitly truncate bswap operand to uint32_t
13408 Give the hunk comment its own color
13409 get_ref_states: strdup entries and free util in stale list
13411 Björn Gustavsson (11):
13412 Teach the --all option to 'git fetch'
13413 Teach the --multiple option to 'git fetch'
13414 Add the configuration option skipFetchAll
13415 Add missing test for 'git remote update --prune'
13416 Re-implement 'git remote update' using 'git fetch'
13417 Clarify and correct -z
13418 apply: apply works outside a repository
13419 apply: Format all options using back-quotes
13420 apply: Use the term "working tree" consistently
13421 Fix over-simplified documentation for 'git log -z'
13422 gitworkflows: Consistently back-quote git commands
13424 Brian Gernhardt (1):
13425 t/gitweb-lib: Split HTTP response with non-GNU sed
13427 Christian Couder (6):
13428 Documentation: add "Fighting regressions with git bisect" article
13429 replace: use a GIT_NO_REPLACE_OBJECTS env variable
13430 Documentation: fix typos and spelling in replace documentation
13431 Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
13432 bisect: simplify calling visualizer using '--bisect' option
13433 Documentation: update descriptions of revision options related to '--bisect'
13436 help: Do not unnecessarily look for a repository
13438 David Soria Parra (1):
13439 Documentation: Document --branch option in git clone synopsis
13442 commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
13444 Felipe Contreras (3):
13445 format-patch: fix parsing of "--" on the command line
13446 format-patch: add test for parsing of "--"
13447 send-email: automatic envelope sender
13449 Horst H. von Brand (1):
13450 git-pull.sh: Fix call to git-merge for new command format
13452 Jakub Narębski (10):
13453 gitweb: Add optional "time to generate page" info in footer
13454 gitweb: Incremental blame (using JavaScript)
13455 gitweb: Colorize 'blame_incremental' view during processing
13456 gitweb: Create links leading to 'blame_incremental' using JavaScript
13457 gitweb: Minify gitweb.js if JSMIN is defined
13458 t/gitweb-lib.sh: Split gitweb output into headers and body
13459 gitweb: Document current snapshot rules via new tests
13460 gitweb.js: Harden setting blamed commit info in incremental blame
13461 gitweb: Make linking to actions requiring JavaScript a feature
13462 gitweb: Add link to other blame implementation in blame views
13465 remote: refactor some logic into get_stale_heads()
13466 teach warn_dangling_symref to take a FILE argument
13467 builtin-fetch: add --prune option
13468 builtin-fetch: add --dry-run option
13471 prune-packed: only show progress when stderr is a tty
13474 t4014-format-patch: do not assume 'test' is available as non-builtin
13475 Add a notice that only certain functions can print color escape codes
13477 Jonathan Nieder (1):
13478 Makefile: do not clean arm directory
13480 Junio C Hamano (19):
13481 mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
13482 Pretty-format: %[+-]x to tweak inter-item newlines
13483 read_revision_from_stdin(): use strbuf
13484 Teach --stdin option to "log" family
13485 setup_revisions(): do not call get_pathspec() too early
13486 Make --stdin option to "log" family read also pathspecs
13487 t9001: test --envelope-sender option of send-email
13488 Add trivial tests for --stdin option to log family
13489 Protect scripted Porcelains from GREP_OPTIONS insanity
13490 builtin-apply.c: pay attention to -p<n> when determining the name
13491 Remove dead code from "git am"
13492 emit_line(): don't emit an empty <SET><RESET> followed by a newline
13493 Update draft release notes to 1.6.6 before merging topics for -rc1
13494 git-merge: a deprecation notice of the ancient command line syntax
13495 Update draft release notes to 1.6.6 before -rc1
13496 Do not misidentify "git merge foo HEAD" as an old-style invocation
13497 merge: do not add standard message when message is given with -m option
13498 Prepare for 1.6.5.4
13502 gitweb: check given hash before trying to create snapshot
13503 gitweb: Smarter snapshot names
13505 Martin Storsjö (3):
13506 Disable CURLOPT_NOBODY before enabling CURLOPT_PUT and CURLOPT_POST
13507 Refactor winsock initialization into a separate function
13508 Enable support for IPv6 on MinGW
13510 Matthew Ogilvie (5):
13511 cvsserver doc: database generally can not be reproduced consistently
13512 config documentation: some configs are auto-set by git-init
13513 t2300: use documented technique to invoke git-sh-setup
13514 t3409 t4107 t7406 t9150: use dashless commands
13515 t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATH
13518 merge-recursive: point the user to commit when file would be overwritten.
13519 user-manual: Document that "git merge" doesn't like uncommited changes.
13520 merge-recursive: make the error-message generation an extern function
13521 builtin-merge: show user-friendly error messages for fast-forward too.
13523 Michael J Gruber (1):
13524 Documentation: Fix a few i.e./e.g. mix-ups
13526 Nanako Shiraishi (2):
13527 t1200: fix a timing dependent error
13528 prepare send-email for smoother change of --chain-reply-to default
13531 pack-objects: split implications of --all-progress from progress activation
13533 Ramsay Allan Jones (1):
13534 git-count-objects: Fix a disk-space under-estimate on Cygwin
13537 strbuf_add_wrapped_text(): skip over colour codes
13538 mergetool--lib: simplify guess_merge_tool()
13541 gitweb.js: fix null object exception in initials calculation
13542 instaweb: restart server if already running
13543 gitweb.js: fix padLeftStr() and its usage
13546 remote-curl.c: fix rpc_out()
13548 Uwe Kleine-König (1):
13549 shortlog: respect commit encoding
13552 Version v1.6.6-rc0; changes since v1.6.5.9:
13553 -------------------------------------------
13556 git-gui: Update russian translation
13558 Alexey Borzenkov (1):
13559 git-gui: store wm state and fix wm geometry
13561 Anders Kaseorg (1):
13562 bisect reset: Allow resetting to any commit, not just a branch
13565 configure: add macro to set arbitrary make variables
13566 configure: add settings for gitconfig, editor and pager
13568 Björn Gustavsson (10):
13569 Teach 'rebase -i' the command "reword"
13570 bash: complete more options for 'git rebase'
13571 Teach 'git merge' and 'git pull' the option --ff-only
13572 format-patch: Always generate a patch
13573 format-patch documentation: Remove diff options that are not useful
13574 format-patch documentation: Fix formatting
13575 format-patch: Add "--no-stat" as a synonym for "-p"
13576 bash: add the merge option --ff-only
13577 Fix truncated usage messages
13578 User Manual: Write "Git" instead of "GIT"
13580 Christian Couder (1):
13581 git: add --no-replace-objects option to disable replacing
13583 Clemens Buchacher (2):
13584 remote-helpers: return successfully if everything up-to-date
13585 set httpd port before sourcing lib-httpd
13588 git-gui: Limit display to a maximum number of files
13591 submodule.c: Squelch a "use before assignment" warning
13594 commit: More generous accepting of RFC-2822 footer lines.
13597 git-blame.el: Change how blame information is shown.
13600 git svn: fix fetch where glob is on the top-level URL
13601 git svn: read global+system config for clone+init
13602 git svn: add authorsfile test case for ~/.gitconfig
13603 git svn: attempt to create empty dirs on clone+rebase
13604 git svn: always reuse existing remotes on fetch
13605 git svn: strip leading path when making empty dirs
13607 Erik Faye-Lund (6):
13608 imap-send: use separate read and write fds
13609 imap-send: use run-command API for tunneling
13610 imap-send: fix compilation-error on Windows
13611 imap-send: build imap-send on Windows
13612 mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
13613 mingw: enable OpenSSL
13615 Felipe Contreras (2):
13617 Use 'fast-forward' all over the place
13620 git-gui: remove warning when deleting correctly merged remote branch
13622 Ingmar Vanhassel (1):
13623 import-tars: Add support for tarballs compressed with lzma, xz
13625 Jakub Narębski (4):
13626 gitweb: Add 'show-sizes' feature to show blob sizes in tree view
13627 gitweb: Refactor 'log' action generation, adding git_log_body()
13628 gitweb: Refactor common parts of 'log' and 'shortlog' views
13629 gitweb: Make 'history' view (re)use git_log_generic()
13632 Teach "git describe" --dirty option
13635 imap-send: remove useless uid code
13636 gitignore: root most patterns at the top-level directory
13637 t915{0,1}: use $TEST_DIRECTORY
13640 git-gui: display summary when showing diff of a submodule
13641 git-gui: fix diff for partially staged submodule changes
13642 git submodule add: make the <path> parameter optional
13643 git-gui: fix use of uninitialized variable
13644 add tests for git diff --submodule
13646 Jimmy Angelakos (1):
13647 git-gui: Added Greek translation & glossary
13650 Teach "-m <msg>" and "-F <file>" to "git notes edit"
13651 fast-import: Add support for importing commit notes
13652 t3302-notes-index-expensive: Speed up create_repo()
13653 Add flags to get_commit_notes() to control the format of the note string
13654 Teach notes code to free its internal data structures on request
13655 Teach the notes lookup code to parse notes trees with various fanout schemes
13656 Add selftests verifying that we can parse notes trees with various fanouts
13657 Refactor notes code to concatenate multiple notes annotating the same object
13658 Add selftests verifying concatenation of multiple notes for the same commit
13660 Johannes Schindelin (8):
13661 print_wrapped_text(): allow hard newlines
13662 Add strbuf_add_wrapped_text() to utf8.[ch]
13663 Introduce commit notes
13664 Add a script to edit/inspect notes
13665 Speed up git notes lookup
13666 Add an expensive test for git-notes
13667 Add '%N'-format for pretty-printing commit notes
13668 Add the --submodule option to the diff option family
13671 Windows: use BLK_SHA1 again
13673 Jonathan Nieder (34):
13674 Add tests for git check-ref-format
13675 check-ref-format: simplify --print implementation
13676 Handle more shell metacharacters in editor names
13677 Retire fetch--tool helper to contrib/examples
13678 Show usage string for 'git grep -h'
13679 Show usage string for 'git cherry -h'
13680 Show usage string for 'git commit-tree -h'
13681 Show usage string for 'git merge-ours -h'
13682 Show usage string for 'git show-ref -h'
13683 http-fetch: add missing initialization of argv0_path
13684 Show usage string for 'git check-ref-format -h'
13685 Show usage string for 'git fast-import -h'
13686 Show usage string for 'git get-tar-commit-id -h'
13687 Show usage string for 'git imap-send -h'
13688 Show usage string for 'git mailsplit -h'
13689 Show usage string for 'git merge-one-file -h'
13690 Show usage string for 'git rev-parse -h'
13691 Show usage string for 'git show-index -h'
13692 Show usage string for 'git unpack-file -h'
13693 Show usage string for 'git stripspace -h'
13694 Let 'git http-fetch -h' show usage outside any git repository
13695 Show usage string for 'git http-push -h'
13696 Let 'git <command> -h' show usage without a git dir
13697 Introduce usagef() that takes a printf-style format
13698 merge-{recursive,subtree}: use usagef() to print usage
13699 diff --no-index: make the usage string less scary
13700 Do not use VISUAL editor on dumb terminals
13701 Suppress warnings from "git var -l"
13702 Teach git var about GIT_EDITOR
13703 Teach git var about GIT_PAGER
13704 add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
13705 am -i, git-svn: use "git var GIT_PAGER"
13706 Provide a build time default-editor setting
13707 Speed up bash completion loading
13709 Julian Phillips (4):
13710 fetch: Speed up fetch by rewriting find_non_local_tags
13711 remote: Make ref_remove_duplicates faster for large numbers of refs
13712 fetch: Speed up fetch of large numbers of refs
13713 remote: fix use-after-free error detected by glibc in ref_remove_duplicates
13715 Junio C Hamano (20):
13716 diff-lib.c: fix misleading comments on oneway_diff()
13717 unpack-trees: typofix
13718 unpack_callback(): use unpack_failed() consistently
13719 git check-ref-format --print
13721 check_filename(): make verify_filename() callable without dying
13722 DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
13723 format_commit_message(): fix function signature
13724 fsck: default to "git fsck --full"
13725 git checkout --no-guess
13726 Teach --wrap to only indent without wrapping
13727 Update draft release notes to 1.6.6
13728 Revert "Don't create the $GIT_DIR/branches directory on init"
13729 t1200: further modernize test script style
13730 t1200: prepare for merging with Fast-forward bikeshedding
13731 builtin-commit.c: fix logic to omit empty line before existing footers
13732 git-describe.txt: formatting fix
13733 Provide a build time default-pager setting
13734 Update draft release notes to 1.6.6
13737 Linus Torvalds (1):
13738 Add '--bisect' revision machinery argument
13740 Marius Storm-Olsen (1):
13741 MSVC: Enable OpenSSL, and translate -lcrypto
13744 http-backend: add GIT_PROJECT_ROOT environment var
13745 http-backend: reword some documentation
13746 http-backend: use mod_alias instead of mod_rewrite
13747 http-backend: add example for gitweb on same URL
13748 http-backend: more explict LocationMatch
13751 instaweb: support mod_cgid for apache2
13753 Markus Heidelberg (1):
13754 bash completion: difftool accepts the same options as diff
13756 Michael J Gruber (1):
13757 Make t9150 and t9151 test scripts executable
13760 pack-objects: move thread autodetection closer to relevant code
13762 Ramsay Allan Jones (2):
13763 Makefile: keep MSVC and Cygwin configuration separate
13764 MSVC: Add support for building with NO_MMAP
13767 describe: load refnames before calling describe()
13768 Implement wrap format %w() as if it is a mode switch
13769 log --format: don't ignore %w() at the start of format string
13770 grep: unset GREP_OPTIONS before spawning external grep
13771 strbuf_add_wrapped_text(): factor out strbuf_add_indented_text()
13772 log --format: document %w
13774 Robin Rosenberg (1):
13775 Don't create the $GIT_DIR/branches directory on init
13778 Documentation: add 'git replace' to main git manpage
13781 git-svn: add test data for SVK merge, with script.
13782 git-svn: allow test setup script to support PERL env. var
13783 git-svn: convert SVK merge tickets to extra parents
13784 git-svn: add test data for SVN 1.5+ merge, with script.
13785 git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
13788 mergetool--lib: add p4merge as a pre-configured mergetool option
13789 Update packfile transfer protocol documentation
13791 Sebastian Schuberth (2):
13792 Use faster byte swapping when compiling with MSVC
13793 Make the MSVC projects use PDB/IDB files named after the project
13795 Shawn O. Pearce (27):
13796 git-gui: Ensure submodule path is quoted properly
13797 pkt-line: Add strbuf based functions
13798 pkt-line: Make packet_read_line easier to debug
13799 fetch-pack: Use a strbuf to compose the want list
13800 Move "get_ack()" back to fetch-pack
13801 Add multi_ack_detailed capability to fetch-pack/upload-pack
13802 remote-curl: Refactor walker initialization
13803 fetch: Allow transport -v -v -v to set verbosity to 3
13804 remote-helpers: Fetch more than one ref in a batch
13805 remote-helpers: Support custom transport options
13806 Move WebDAV HTTP push under remote-curl
13807 Git-aware CGI to provide dumb HTTP transport
13808 Add stateless RPC options to upload-pack, receive-pack
13809 Smart fetch and push over HTTP: server side
13810 Discover refs via smart HTTP server when available
13811 Smart push over HTTP: client side
13812 Smart fetch over HTTP: client side
13813 Smart HTTP fetch: gzip requests
13814 http tests: use /dumb/ URL prefix
13815 test smart http fetch and push
13816 http-backend: Use http.getanyfile to disable dumb HTTP serving
13817 http-backend: Test configuration options
13818 Git-aware CGI to provide dumb HTTP transport
13819 http-backend: Protect GIT_PROJECT_ROOT from /../ requests
13820 t5551-http-fetch: Work around some libcurl versions
13821 t5551-http-fetch: Work around broken Accept header in libcurl
13822 http-backend: Fix bad treatment of uintmax_t in Content-Length
13825 rebase -i: fix reword when using a terminal editor
13826 gitweb: linkify author/committer names with search
13827 t1402: Make test executable
13828 t1200: cleanup and modernize test style
13829 t1200: Make documentation and test agree
13830 t3101: test more ls-tree options
13831 ls-tree: migrate to parse-options
13833 Tarmigan Casebolt (3):
13834 Check the format of more printf-type functions
13835 http-backend: Fix access beyond end of string.
13836 http-backend: Let gcc check the format of more printf-type functions.
13839 http-push: fix check condition on http.c::finish_http_pack_request()
13840 t5540-http-push: remove redundant fetches
13843 Documentation: update pt-BR
13846 bash completion: complete refs for git-grep
13847 Let --decorate show HEAD position
13848 Refactor pretty_print_commit arguments into a struct
13849 reflog-walk: refactor the branch@{num} formatting
13850 Introduce new pretty formats %g[sdD] for reflog information
13851 stash list: use new %g formats instead of sed
13852 stash list: drop the default limit of 10 stashes
13853 describe: when failing, tell the user about options that work
13854 filter-branch: stop special-casing $filter_subdir argument
13855 filter-branch: nearest-ancestor rewriting outside subdir filter
13856 Documentation: clarify 'ours' merge strategy
13857 rebase docs: clarify --merge and --strategy
13858 Document git-svn's first-parent rule
13859 describe: do not use unannotated tag even if exact match
13862 git svn: handle SVN merges from revisions past the tip of the branch
13865 git-gui: adjust the minimum height of diff pane for shorter screen height
13868 git-update-index.txt: Document the --really-refresh option.
13871 Version v1.6.5.9; changes since v1.6.5.8:
13872 -----------------------------------------
13874 Björn Gustavsson (3):
13875 Documentation: 'git add -A' can remove files
13876 git-add/rm doc: Consistently back-quote
13877 git-rm doc: Describe how to sync index & work tree
13880 Check size of path buffer before writing into it
13882 Jakub Narębski (1):
13883 gitweb: Introduce esc_attr to escape attributes of HTML elements
13886 blame: prevent a segv when -L given start > EOF
13889 fix memcpy of overlapping area
13890 dwim_ref: fix dangling symref warning
13892 Junio C Hamano (2):
13893 t8003: check exit code of command and error message separately
13897 diff: make sure --output=/bad/path is caught
13900 Remove extra '-' from git-am(1)
13903 octopus: make merge process simpler to follow
13904 octopus: reenable fast-forward merges
13905 octopus: remove dead code
13906 request-pull.txt: Document -p option
13909 stash pop: remove 'apply' options during 'drop' invocation
13911 Uwe Kleine-König (1):
13912 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
13915 Version v1.6.5.8; changes since v1.6.5.7:
13916 -----------------------------------------
13918 Andreas Gruenbacher (3):
13919 base85 debug code: Fix length byte calculation
13920 base85: encode_85() does not use the decode table
13921 base85: Make the code more obvious instead of explaining the non-obvious
13923 Andreas Schwab (1):
13924 git count-objects: handle packs bigger than 4G
13926 Björn Gustavsson (1):
13927 rebase -i: abort cleanly if the editor fails to launch
13930 Prevent git blame from segfaulting on a missing author name
13932 Dmitry Potapov (1):
13933 fast-import: tag may point to any object type
13936 commit: --cleanup is a message option
13939 reset: unbreak hard resets with GIT_WORK_TREE
13940 textconv: stop leaking file descriptors
13943 grep: NUL terminate input from a file
13945 Junio C Hamano (3):
13946 checkout -m: do not try to fall back to --merge from an unborn branch
13947 Fix mis-backport of t7002
13951 branch: die explicitly why when calling "git branch [-a|-r] branchname".
13953 Nguyễn Thái Ngọc Duy (1):
13954 t7102: make the test fail if one of its check fails
13957 api-strbuf.txt: fix typos and document launch_editor()
13958 technical-docs: document hash API
13961 bash completion: factor submodules into dirty state
13964 Version v1.6.5.7; changes since v1.6.5.6:
13965 -----------------------------------------
13968 ignore unknown color configuration
13971 help.autocorrect: do not run a command if the command given is junk
13973 Junio C Hamano (2):
13974 worktree: don't segfault with an absolute pathspec without a work tree
13977 Nanako Shiraishi (1):
13978 Illustrate "filter" attribute with an example
13981 Version v1.6.5.6; changes since v1.6.5.5:
13982 -----------------------------------------
13985 pull: clarify advice for the unconfigured error case
13988 add-interactive: fix deletion of non-empty files
13990 Junio C Hamano (3):
13991 Remove post-upload-hook
13992 Fix archive format with -- on the command line
13996 merge-recursive: make the error-message generation an extern function
13997 builtin-merge: show user-friendly error messages for fast-forward too.
14000 Version v1.6.5.5; changes since v1.6.5.4:
14001 -----------------------------------------
14003 Avery Pennarun (1):
14004 builtin-merge.c: call exclude_cmds() correctly.
14007 t4201: use ISO8859-1 rather than ISO-8859-1
14010 grep: Allow case insensitive search of fixed-strings
14012 Felipe Contreras (2):
14013 format-patch: fix parsing of "--" on the command line
14014 format-patch: add test for parsing of "--"
14017 diffcore-break: free filespec data as we go
14018 diffcore-break: save cnt_data for other phases
14019 rerere: don't segfault on failure to open rr-cache
14020 reset: improve worktree safety valves
14022 Junio C Hamano (7):
14023 diffcore-rename: reduce memory footprint by freeing blob data early
14024 Documentation: avoid xmlto input error
14025 Protect scripted Porcelains from GREP_OPTIONS insanity
14026 Remove dead code from "git am"
14027 Documentation: xmlto 0.0.18 does not know --stringparam
14028 Prepare for 1.6.5.5
14031 Linus Torvalds (1):
14032 Fix diff -B/--dirstat miscounting of newly added contents
14034 Lukas Sandström (1):
14035 git am/mailinfo: Don't look at in-body headers when rebasing
14037 Matthew Ogilvie (1):
14038 core.autocrlf documentation: mention the crlf attribute
14041 Expand ~ and ~user in core.excludesfile, commit.template
14042 expand_user_path: expand ~ to $HOME, not to the actual homedir.
14043 merge-recursive: point the user to commit when file would be overwritten.
14044 user-manual: Document that "git merge" doesn't like uncommited changes.
14047 give priority to progress messages
14049 Philippe Bruhat (1):
14050 Make sure $PERL_PATH is defined when the test suite is run.
14053 Add branch management for releases to gitworkflows
14055 Ramsay Allan Jones (3):
14056 Makefile: merge two Cygwin configuration sections into one
14057 t9700-perl-git.sh: Fix a test failure on Cygwin
14058 git-count-objects: Fix a disk-space under-estimate on Cygwin
14061 mergetool--lib: simplify guess_merge_tool()
14062 archive: clarify description of path parameter
14065 Update 'git remote update' usage string to match man page.
14066 git remote: Separate usage strings for subcommands
14068 Todd Zullinger (1):
14069 Documentation: Avoid use of xmlto --stringparam
14071 Uwe Kleine-König (1):
14072 shortlog: respect commit encoding
14075 Version v1.6.5.4; changes since v1.6.5.3:
14076 -----------------------------------------
14079 help: Do not unnecessarily look for a repository
14081 David Soria Parra (1):
14082 Documentation: Document --branch option in git clone synopsis
14085 Documentation: undocument gc'd function graph_release()
14088 prune-packed: only show progress when stderr is a tty
14090 Junio C Hamano (7):
14091 builtin-apply.c: pay attention to -p<n> when determining the name
14092 Do not misidentify "git merge foo HEAD" as an old-style invocation
14093 merge: do not add standard message when message is given with -m option
14094 Prepare for 1.6.5.4
14095 Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make
14096 Unconditionally set man.base.url.for.relative.links
14099 Michael J Gruber (1):
14100 Documentation: Fix a few i.e./e.g. mix-ups
14103 pack-objects: split implications of --all-progress from progress activation
14106 instaweb: restart server if already running
14109 Version v1.6.5.3; changes since v1.6.5.2:
14110 -----------------------------------------
14112 Björn Gustavsson (1):
14113 git-clone.txt: Fix grammar and formatting
14115 Björn Steinbrink (1):
14116 pre-commit.sample: Diff against the empty tree when HEAD is invalid
14118 Clemens Buchacher (1):
14119 modernize fetch/merge/pull examples
14121 Daniel Barkalow (2):
14122 Require a struct remote in transport_get()
14123 Allow curl helper to work without a local repository
14125 Dmitry V. Levin (1):
14126 Makefile: add compat/bswap.h to LIB_H
14129 help -i: properly error out if no info viewer can be found
14132 More precise description of 'git describe --abbrev'
14133 Fix documentation grammar typo
14135 Giuseppe Bilotta (1):
14136 gitweb: fix esc_param
14138 Jakub Narębski (1):
14139 gitweb: Do not show 'patch' link for merge commits
14142 rebase -i: more graceful handling of invalid commands
14145 Documentation/fetch-options.txt: order options alphabetically
14146 Documentation/git-pull.txt: Add subtitles above included option files
14147 Documentation/merge-options.txt: order options in alphabetical groups
14150 cvsimport: fix relative argument filenames
14151 push: always load default config
14152 add-interactive: handle deletion of empty files
14153 ls-files: unbreak "ls-files -i"
14154 push: fix typo in usage
14155 format-patch: make "-p" suppress diffstat
14157 Johannes Schindelin (3):
14158 blame: make sure that the last line ends in an LF
14159 help -a: do not unnecessarily look for a repository
14160 diff --color-words -U0: fix the location of hunk headers
14162 Jonathan Nieder (4):
14163 clone: detect extra arguments
14164 Add intermediate build products to .gitignore
14165 check-ref-format: update usage string
14166 merge: do not setup worktree twice
14168 Junio C Hamano (22):
14169 apply --whitespace=fix: fix handling of blank lines at the eof
14170 apply --whitespace=fix: detect new blank lines at eof correctly
14171 apply.c: split check_whitespace() into two
14172 apply --whitespace=warn/error: diagnose blank at EOF
14173 apply --whitespace: warn blank but not necessarily empty lines at EOF
14174 diff.c: the builtin_diff() deals with only two-file comparison
14175 diff --whitespace=warn/error: obey blank-at-eof
14176 diff --whitespace=warn/error: fix blank-at-eof check
14177 diff --color: color blank-at-eof
14178 core.whitespace: split trailing-space into blank-at-{eol,eof}
14179 diff --whitespace: fix blank lines at end
14180 diff.c: shuffling code around
14181 diff.c: split emit_line() from the first char and the rest of the line
14182 diff.c: emit_add_line() takes only the rest of the line
14183 diff -B: colour whitespace errors
14184 info/grafts: allow trailing whitespaces at the end of line
14185 gc --auto --quiet: make the notice a bit less verboase
14186 receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
14187 clone: fix help on options
14188 diff --color-words: bit of clean-up
14189 check-ref-format -h: it does not know the --print option yet
14192 Markus Heidelberg (1):
14193 t4034-diff-words: add a test for word diff without context
14196 gitweb: Fix blob linenr links in pathinfo mode
14198 Sebastian Schuberth (1):
14199 Do not try to remove directories when removing old links
14202 git-add.txt: fix formatting of --patch section
14205 Quote ' as \(aq in manpages
14207 Todd Zullinger (1):
14208 Makefile: Ensure rpm packages can be read by older rpm versions
14211 imap-send.c: fix compiler warnings for OpenSSL 1.0
14214 Version v1.6.5.2; changes since v1.6.5.1:
14215 -----------------------------------------
14217 Andreas Schwab (1):
14218 Work around option parsing bug in the busybox tar implementation
14220 Carlos R. Mafra (1):
14221 Makefile: clean block-sha1/ directory instead of mozilla-sha1/
14224 ls-files: excludes should not impact tracked files
14225 document push's new quiet option
14228 git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
14231 Remove a left-over file from t/t5100
14232 Mark files in t/t5100 as UTF-8
14234 Jonathan Nieder (1):
14235 Documentation: describe check-ref-format --branch
14237 Junio C Hamano (4):
14238 Fix incorrect error check while reading deflated pack data
14239 Do not fail "describe --always" in a tag-less repository
14240 Fix list of released versions in the toc document
14243 Markus Heidelberg (1):
14244 t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
14247 Documentation/git-gc.txt: change "references" to "reference"
14249 Nanako Shiraishi (2):
14250 git push: remove incomplete options list from help text
14251 git push: say that --tag can't be used with --all or --mirror in help text
14253 Nasser Grainawi (1):
14254 Document `delta` attribute in "git help attributes".
14256 Pauli Virtanen (1):
14257 git-add--interactive: never skip files included in index
14260 Version v1.6.5.1; changes since v1.6.5:
14261 ---------------------------------------
14263 Björn Steinbrink (1):
14264 clone: Supply the right commit hash to post-checkout when -b is used
14267 remote-curl: add missing initialization of argv0_path
14269 Junio C Hamano (1):
14273 grep: do not segfault when -f is used
14276 git-stash documentation: mention default options for 'list'
14279 change throughput display units with fast links
14281 Shawn O. Pearce (1):
14282 sha1_file: Fix infinite loop when pack is corrupted
14285 Version v1.6.5; changes since v1.6.5-rc3:
14286 -----------------------------------------
14288 Alexander Gavrilov (1):
14289 git-svn: Avoid spurious errors when rewriteRoot is used.
14292 ls-files: die instead of fprintf/exit in -i error
14294 Björn Gustavsson (1):
14295 bash: add support for 'git replace'
14298 Makefile: enable THREADED_DELTA_SEARCH on IRIX and IRIX64
14299 Makefile: add a note about the NO_MMAP setting on IRIX and IRIX64
14301 Christian Himpel (2):
14302 git-am: fixed patch_format detection according to RFC2822
14303 git-am: force egrep to use correct characters set
14305 Erik Faye-Lund (2):
14306 increase portability of NORETURN declarations
14307 add NORETURN_PTR for function pointers
14309 Felipe Contreras (1):
14310 send-email: fix mutt regex for grouped aliases
14312 Ingmar Vanhassel (1):
14313 import-tars: Add missing closing bracket
14316 improve reflog date/number heuristic
14317 pull: improve advice for unconfigured error case
14319 Jonathan Nieder (8):
14320 Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in Makefile
14321 Documentation: git fmt-merge-msg does not have to be a script
14322 Documentation: clarify mergeoptions description
14323 Documentation: branch: update --merged description
14324 Documentation: clarify branch creation
14325 Documentation: clarify "working tree" definition
14326 racy-git.txt: explain nsec problem in more detail
14327 Documentation: clone: clarify discussion of initial branch
14329 Junio C Hamano (2):
14330 Update draft release notes to 1.6.5
14333 Ramsay Allan Jones (2):
14334 Fix MSVC build on cygwin
14335 Fix the exit code of MSVC build scripts on cygwin
14338 Git archive and trailing "/" in prefix
14341 git-svn: hide find_parent_branch output in double quiet mode
14344 completion: fix completion of git <TAB><TAB>
14345 completion: fix alias listings with newlines
14348 Version v1.6.5-rc3; changes since v1.6.5-rc2:
14349 ---------------------------------------------
14352 filter-branch: add --prune-empty to option summary
14354 Andreas Schwab (1):
14355 parse-opt: ignore negation of OPT_NONEG for ambiguity checks
14358 perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR
14359 Documentation/git-gc.txt: default --aggressive window is 250, not 10
14360 Makefile: enable THREADED_DELTA_SEARCH on SunOS
14362 Frederik Schwarzer (1):
14363 Correct minor typo in post-receive hook template
14366 typo fix: Directory `...' exist, ...: s/exist/exists/
14369 Fix '--relative-date'
14371 Junio C Hamano (4):
14372 builtin-mailinfo.c: check error status from rewind and ftruncate
14373 show-branch: fix segfault when showbranch.default exists
14374 git-pull: dead code removal
14375 fast-import.c::validate_raw_date(): really validate the value
14378 tests: make all test files executable
14380 Michael Wookey (1):
14381 generators/vcproj.pm: remove UNICODE from build
14384 git branch -D: give a better error message when lockfile creation fails
14387 make 'git clone' ask the remote only for objects it cares about
14389 Ramsay Allan Jones (1):
14390 Fix some printf format warnings
14393 bash: teach 'git checkout' options
14395 Sebastian Schuberth (2):
14396 Make generated MSVC solution file open from Windows Explorer
14397 Make just opening the generated MSVC solution file not modify it
14400 README: git lives at http://git-scm.com these days
14403 completion: update am, commit, and log
14404 completion: add dirstat and friends to diff options
14407 send-email: fix obscure error when encryption=tls and smtp cannot connect
14410 Version v1.6.5-rc2; changes since v1.6.5-rc1:
14411 ---------------------------------------------
14413 Clemens Buchacher (2):
14414 test local clone by copying
14415 cvs: initialize empty password
14417 Dmitry Potapov (2):
14418 git-archive: add '-o' as a alias for '--output'
14419 git-archive: infer output format from filename when unspecified
14422 Avoid declaration after statement
14423 Change regerror() declaration from K&R style to ANSI C (C89)
14424 Fix __stdcall placement and function prototype
14425 Test for WIN32 instead of __MINGW32_
14426 Add MinGW header files to build git with MSVC
14427 Add platform files for porting to MSVC
14430 remove logical typo in documentation of sample update hook
14431 web--browse: fix Mac OS X GUI detection for 10.6
14434 pre-commit.sample: add comment re tr portability; fix grammar
14436 Johannes Gilger (1):
14437 git-clone doc: typofix
14440 test-genrandom: ensure stdout is set to _O_BINARY on Windows
14442 Junio C Hamano (6):
14443 git-commit doc: remove duplicated --dry-run description
14444 http.c: avoid freeing an uninitialized pointer
14446 Update Release Notes to 1.6.5
14447 pay attention to DESTDIR when building with NO_PERL_MAKEMAKER
14448 pull: Clarify "helpful" message for another corner case
14450 Marius Storm-Olsen (9):
14451 Add include guards to compat/win32.h
14452 Set _O_BINARY as default fmode for both MinGW and MSVC
14453 Add empty header files for MSVC port
14454 Make usage of windows.h lean and mean
14455 Define strncasecmp and ftruncate for MSVC
14456 Add MSVC to Makefile
14457 Add README for MSVC build
14458 Add scripts to generate projects for other buildsystems (MSVC vcproj, QMake)
14459 Tag GIT_VERSION when Git is built with MSVC
14462 push: Correctly initialize nonfastforward in transport_push.
14465 git-push: Accept -n as a synonym for --dry-run.
14468 Nicolas Pitre has a new email address
14471 gitk: Work around leftover temporary save file
14473 Paul Mackerras (1):
14474 gitk: Show diff of commits at end of compare-commits output
14476 Peter Krefting (1):
14477 gitk: Update Swedish translation (280t0f0u)
14480 bash: rename __git_find_subcommand() to __git_find_on_cmdline()
14481 bash: update 'git stash' completion
14482 bash: teach 'git reset --patch'
14485 Update the usage bundle string.
14486 pack-objects: remove SP at the end of usage string
14487 Update "describe" documentation to match reality
14489 Todd Zullinger (1):
14490 completion: Replace config --list with --get-regexp
14493 Version v1.6.5-rc1; changes since v1.6.5-rc0:
14494 ---------------------------------------------
14496 Brian Gernhardt (4):
14497 INSTALL: Update description of our SHA-1 code
14498 Makefile: Add NEEDS_CRYPTO_WITH_SSL
14499 INSTALL: Reorder dependencies, split shell and Perl
14500 INSTALL: Describe dependency knobs from Makefile
14502 Clemens Buchacher (3):
14503 grep: fix exit status if external_grep() punts
14504 grep: accept relative paths outside current working directory
14505 preserve mtime of local clone
14507 Daniel Barkalow (4):
14508 Add support for external programs for handling native fetches
14509 Use an external program to implement fetching with curl
14510 Make the "traditionally-supported" URLs a special case
14511 Use a clearer style to issue commands to remote helpers
14514 Improve --patch option documentation in git-add
14517 Makefile: git-http-fetch does not need expat
14518 push: make non-fast-forward help message configurable
14519 status: make "how to stage" messages optional
14520 rebase: use plumbing to show dirty state
14523 use write_str_in_full helper to avoid literal string lengths
14524 use write_str_in_full helper to avoid literal string lengths
14525 don't dereference NULL upon fdopen failure
14528 start_command: do not clobber cmd->env on Windows code path
14529 pager: set LESS=FRSX also on Windows
14532 Wrap rewrite globals in a struct in preparation for adding another set
14533 Add url.<base>.pushInsteadOf: URL rewriting for push only
14535 Junio C Hamano (7):
14536 Makefile: do not link three copies of git-remote-* programs
14537 Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
14538 merge-recursive: give less scary messages when merge did not start
14539 Makefile: remove remnant of separate http/https/ftp helpers
14541 quiltimport documentation: --dry-run and -n are synonyms
14544 Linus Torvalds (1):
14545 git-http-fetch: not a builtin
14548 svn: properly escape arguments for authors-prog
14550 Martin Nordholts (1):
14551 git.el: Use git-add-file for unmerged files, remove git-resolve-file
14554 wrap git's main usage string.
14557 Add transport native helper executables to .gitignore
14558 http-fetch: Fix Makefile dependancies
14560 Nicolas Sebrecht (2):
14561 mailinfo: add '--scissors' to usage message
14562 add documentation for mailinfo.scissors and '--no-scissors'
14564 Peter Krefting (2):
14565 import-tars: Allow per-tar author and commit message.
14566 Add script for importing bits-and-pieces to Git.
14569 git-p4: Avoid modules deprecated in Python 2.6.
14572 http.c: remove verification of remote packs
14575 Version v1.6.5-rc0; changes since v1.6.4.5:
14576 -------------------------------------------
14579 svn: Add && to t9107-git-svn-migrate.sh
14580 svn: Honor --prefix option in init without --stdlayout
14581 svn: allow branches outside of refs/remotes
14584 graph API: use a new color when starting a brand new column
14585 graph API: fix bug in graph_is_interesting()
14586 Add tests for rev-list --graph with options that simplify history
14589 Add a reminder test case for a merge with F/D transition
14590 Add date formatting and parsing functions relative to a given time
14592 Alexandre Julliard (1):
14593 read-tree: Fix regression with creation of a new index file.
14595 André Goddard Rosa (1):
14596 Fix typos on pt_BR/gittutorial.txt translation
14598 Benjamin Kramer (1):
14599 gitweb: Optimize git-favicon.png
14601 Björn Steinbrink (1):
14602 git-describe: Die early if there are no possible descriptions
14605 strbuf: add new function strbuf_getwholeline()
14606 builtin-mailinfo,builtin-mailsplit: use strbufs
14607 builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used
14608 block-sha1/sha1.c: silence compiler complaints by casting void * to char *
14609 git-compat-util.h: remove superfluous test for __sun__
14610 Makefile: remove pointless conditional assignment in SunOS section
14611 abspath.c: move declaration of 'len' into inner block and use appropriate type
14612 commit.c: rename variable named 'n' which masks previous declaration
14613 t/test-lib.sh: provide a shell implementation of the 'yes' utility
14615 Brian Gianforcaro (1):
14616 Style fixes, add a space after if/for/while.
14618 Christian Couder (13):
14619 refs: add a "for_each_replace_ref" function
14620 replace_object: add mechanism to replace objects found in "refs/replace/"
14621 sha1_file: add a "read_sha1_file_repl" function
14622 object: call "check_sha1_signature" with the replacement sha1
14623 replace_object: add a test case
14624 mktag: call "check_sha1_signature" with the replacement sha1
14625 environment: add global variable to disable replacement
14626 Add new "git replace" command
14627 builtin-replace: teach "git replace" to actually replace
14628 parse-options: add new function "usage_msg_opt"
14629 builtin-replace: use "usage_msg_opt" to give better error messages
14630 Documentation: add documentation for "git replace"
14631 t6050: check pushing something based on a replaced commit
14634 Add git-replace to .gitignore
14637 git.el: Clarify documentation of git-commit-tree
14639 David Soria Parra (1):
14640 run-command.c: squelch a "use before assignment" warning
14643 git-cvsimport: add support for cvs pserver password scrambling.
14646 svn: initial "master" points to trunk if possible
14647 svn: (cleanup) use predefined constant for rev_map_fmt
14648 svn: assume URLs from the command-line are URI-encoded
14650 Geoffrey Irving (1):
14651 git fast-export: add --no-data option
14653 Giuseppe Bilotta (3):
14654 gitweb: fix 'Use of uninitialized value' error in href()
14655 git apply: option to ignore whitespace differences
14656 gitweb: pull ref markes pull out of subject <a> element
14659 cvsimport: add test illustrating a bug in cvsps
14660 cvsimport: extend testcase about patchset order to contain branches
14662 Jakub Narębski (6):
14663 gitweb: Make .error style generic
14664 gitweb: Mark boundary commits in 'blame' view
14665 gitweb: Use "previous" header of git-blame -p in 'blame' view
14666 gitweb: Mark commits with no "previous" in 'blame' view
14667 gitweb: Add author initials in 'blame' view, a la "git gui blame"
14668 gitweb: Use light/dark for class names also in 'blame' view
14671 git-tag(1): Refer to git-check-ref-format(1) for <name>
14674 push: add --quiet flag
14675 transport: pass "quiet" flag to pack-objects
14676 transport: don't show push status if --quiet is given
14677 tests: use "$TEST_DIRECTORY" instead of ".."
14678 tests: provide $TRASH_DIRECTORY variable
14679 tests: allow user to specify trash directory location
14680 t/Makefile: include config.mak
14681 allow pull --rebase on branch yet to be born
14682 tests: disable interactive hunk selection tests if perl is not available
14683 clone: add --branch option to select a different HEAD
14684 refactor test-date interface
14685 tests: add date printing and parsing tests
14686 fix approxidate parsing of relative months and years
14687 push: teach --quiet to suppress "Everything up-to-date"
14690 Check return value of ftruncate call in http.c
14693 git submodule summary: add --files option
14696 git submodule foreach: Provide access to submodule name, as '$name'
14697 git submodule: Cleanup usage string and add option parsing to cmd_foreach()
14698 Add selftest for 'git submodule foreach'
14699 git submodule foreach: test access to submodule name as '$name'
14700 git submodule foreach: Add --recursive to recurse into nested submodules
14701 git submodule update: Introduce --recursive to update nested submodules
14702 git submodule status: Add --recursive to recurse into nested submodules
14703 t7407: Use 'rev-parse --short' rather than bash's substring expansion notation
14704 git clone: Add --recursive to automatically checkout (nested) submodules
14706 Johannes Schindelin (2):
14707 Make 'git stash -k' a short form for 'git stash save --keep-index'
14708 parse-opt: optionally show "--no-" option string
14710 Johannes Sixt (13):
14711 MinGW: simplify waitpid() emulation macros
14712 run_command: return exit code as positive value
14713 run_command: report system call errors instead of returning error codes
14714 run_command: encode deadly signal number in the return value
14715 run_command: report failure to execute the program, but optionally don't
14716 receive-pack: remove unnecessary run_status report
14717 api-run-command.txt: describe error behavior of run_command functions
14718 t0001-init: fix a file name
14719 t0001-init: split the existence test from the permission test
14720 gitk: Do not hard-code "encoding" in attribute lookup functions
14721 Make test number t7406- unique
14722 Make test case number unique
14723 status: list unmerged files much later
14725 Junio C Hamano (31):
14726 t/t9600: remove exit after test_done
14728 request-pull: optionally show a patch as well
14729 diff-index: report unmerged new entries
14730 diff-index: keep the original index intact
14731 Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings
14732 wt-status.c: rework the way changes to the index and work tree are summarized
14733 git-rev-list.txt: Clarify the use of multiple revision arguments
14734 block-sha1: undo ctx->size change
14735 block-sha1: minor fixups
14736 am: allow individual e-mail files as input
14737 status: show worktree status of conflicted paths separately
14738 verify-pack --stat-only: show histogram without verifying
14740 wt-status: move many global settings to wt_status structure
14741 wt-status: move wt_status_colors[] into wt_status structure
14742 Make git_status_config() file scope static to builtin-commit.c
14743 wt-status: collect untracked files in a separate "collect" phase
14744 Documentation/git-commit.txt: describe --dry-run
14745 git commit --dry-run -v: show diff in color when asked
14746 compat/snprintf.c: clarify SNPRINTF_SIZE_CORR
14747 builtin-mailinfo.c: fix confusing internal API to mailinfo()
14748 Teach mailinfo to ignore everything before -- >8 -- mark
14749 am/mailinfo: Disable scissors processing by default
14750 mailinfo.scissors: new configuration
14751 Draft release notes to 1.6.5 before -rc0
14752 upload-pack: add a trigger for post-upload-pack hook
14753 upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook
14754 builtin-pack-objects.c: avoid vla
14755 builtin-apply.c: get rid of an unnecessary use of temporary array
14759 git-svn: Use GIT_SSH setting if SVN_SSH is not set
14762 Documentaqtion/git-submodule.txt: Typofix
14763 git-log: allow --decorate[=short|full]
14765 Linus Torvalds (12):
14766 Add new optimized C 'block-sha1' routines
14767 block-sha1: try to use rol/ror appropriately
14768 block-sha1: make the 'ntohl()' part of the first SHA1 loop
14769 block-sha1: re-use the temporary array as we calculate the SHA1
14770 block-sha1: macroize the rounds a bit further
14771 block-sha1: Use '(B&C)+(D&(B^C))' instead of '(B&C)|(D&(B|C))' in round 3
14772 block-sha1: get rid of redundant 'lenW' context
14773 block-sha1: perform register rotation using cpp
14774 block-sha1: improved SHA1 hashing
14775 block-sha1: improve code on large-register-set machines
14776 Improve on 'approxidate'
14777 Further 'approxidate' improvements
14780 git-p4: stream from perforce to speed up clones
14783 gitweb: support to globally disable a snapshot format
14784 gitweb: update INSTALL regarding specific snapshot settings
14785 gitweb: add support for XZ compressed snapshots
14786 gitweb: improve snapshot error handling
14787 gitweb: split test suite into library and tests
14788 gitweb: add t9501 tests for checking HTTP status codes
14791 rebase: consistent error messages for staged and unstaged changes.
14792 git-ls-files.txt: clarify what "other files" mean for --other
14793 Show usage string for 'git log -h', 'git show -h' and 'git diff -h'
14794 Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.
14795 reset: make the reminder output consistent with "checkout"
14796 stash: simplify defaulting to "save" and reject unknown options
14798 Michael Haggerty (6):
14799 Start a library for cvsimport-related tests
14800 Use CVS's -f option if available (ignore user's ~/.cvsrc file)
14801 Test contents of entire cvsimported "master" tree contents
14802 Add some tests of git-cvsimport's handling of vendor branches
14803 Add a test of "git cvsimport"'s handling of tags and branches
14804 git-svn: ignore leading blank lines in svn:ignore
14806 Michael J Gruber (3):
14807 t6010-merge-base.sh: Depict the octopus test graph
14808 git-merge-base/git-show-branch: Cleanup documentation and usage
14809 git-merge-base/git-show-branch --merge-base: Documentation and test
14811 Michał Kiedrowicz (2):
14812 init-db: migrate to parse-options
14813 grep: Add --max-depth option.
14815 Nanako Shiraishi (3):
14816 git init: optionally allow a directory argument
14817 Documentation: consistently refer to check-ref-format
14818 Documentation: describe the scissors mark support of "git am"
14820 Nguyễn Thái Ngọc Duy (1):
14821 Prevent diff machinery from examining assume-unchanged entries on worktree
14824 Shift object enumeration out of upload-pack
14826 Nicolas Pitre (11):
14827 block-sha1: move code around
14828 block-sha1: split the different "hacks" to be individually selected
14829 block-sha1: support for architectures with memory alignment restrictions
14830 block-sha1: more good unaligned memory access candidates
14831 block-sha1: make the size member first in the context struct
14832 make sure byte swapping is optimal for git
14833 block-sha1: guard gcc extensions with __GNUC__
14834 remove ARM and Mozilla SHA1 implementations
14835 fix simple deepening of a repo
14836 make shallow repository deepening more network efficient
14837 pack-objects: free preferred base memory after usage
14839 Nicolas Sebrecht (1):
14840 git-am: print fair error message when format detection fails
14843 git stash: Give friendlier errors when there is nothing to apply
14846 Do not scramble password read from .cvspass
14849 update-server-info: make builtin, use parseopt
14850 UI consistency: allow --force for where -f means force
14853 read-tree: convert unhelpful usage()'s to helpful die()'s
14854 read-tree: migrate to parse-options
14855 write-tree: migrate to parse-options
14856 verify-tag: migrate to parse-options
14857 verify-pack: migrate to parse-options
14858 prune-packed: migrate to parse-options
14859 technical-docs: document tree-walking API
14862 http.c: free preq when aborting
14863 http.c: replace usage of temporary variable for urls
14865 Thadeu Lima de Souza Cascardo (1):
14866 Translate the tutorial to Brazillian Portuguese
14869 Document 'stash clear' recovery via unreachable commits
14870 gitk: New option to hide remote refs
14871 gitk: Fix direction of symmetric difference in optimized mode
14872 gitk: Parse arbitrary commit-ish in SHA1 field
14873 git-apply--interactive: Refactor patch mode code
14874 Add a small patch-mode testing library
14875 builtin-add: refactor the meat of interactive_add()
14876 Implement 'git reset --patch'
14877 Implement 'git checkout --patch'
14878 Implement 'git stash save --patch'
14879 DWIM 'git stash save -p' for 'git stash -p'
14881 Tuomas Suutari (1):
14882 git-svn.txt: Fix location of parent argument
14884 Wesley J. Landaker (2):
14885 Documentation: git-send-email: fix submission port number
14886 Documentation: git-send-email: correct statement about standard ports
14889 Add support for the Mongoose web server.
14892 Version v1.6.4.5; changes since v1.6.4.4:
14893 -----------------------------------------
14895 Andreas Gruenbacher (3):
14896 base85 debug code: Fix length byte calculation
14897 base85: encode_85() does not use the decode table
14898 base85: Make the code more obvious instead of explaining the non-obvious
14900 Andreas Schwab (1):
14901 git count-objects: handle packs bigger than 4G
14904 ls-files: die instead of fprintf/exit in -i error
14907 help -i: properly error out if no info viewer can be found
14910 Check size of path buffer before writing into it
14913 commit: --cleanup is a message option
14915 Jakub Narębski (1):
14916 gitweb: Introduce esc_attr to escape attributes of HTML elements
14919 rebase -i: more graceful handling of invalid commands
14922 ls-files: excludes should not impact tracked files
14923 textconv: stop leaking file descriptors
14925 Jonathan Nieder (1):
14926 Documentation: describe check-ref-format --branch
14928 Junio C Hamano (5):
14929 show-branch: fix segfault when showbranch.default exists
14930 fast-import.c::validate_raw_date(): really validate the value
14931 checkout -m: do not try to fall back to --merge from an unborn branch
14932 Fix mis-backport of t7002
14936 grep: do not segfault when -f is used
14939 push: Correctly initialize nonfastforward in transport_push.
14940 branch: die explicitly why when calling "git branch [-a|-r] branchname".
14943 git-stash documentation: mention default options for 'list'
14945 Nguyễn Thái Ngọc Duy (1):
14946 t7102: make the test fail if one of its check fails
14948 Uwe Kleine-König (1):
14949 rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
14952 Version v1.6.4.4; changes since v1.6.4.3:
14953 -----------------------------------------
14956 checkout: do not imply "-f" on unborn branches
14958 Junio C Hamano (6):
14959 Fix "unpack-objects --strict"
14960 check_path(): allow symlinked directories to checkout-index --prefix
14961 xutils: Fix hashing an incomplete line with whitespaces at the end
14962 xutils: Fix xdl_recmatch() on incomplete lines
14963 http.c: avoid freeing an uninitialized pointer
14967 Version v1.6.4.3; changes since v1.6.4.2:
14968 -----------------------------------------
14971 githooks.txt: put hooks into subsections
14973 Clemens Buchacher (2):
14974 grep: fix exit status if external_grep() punts
14975 grep: accept relative paths outside current working directory
14977 Emmanuel Trillaud (1):
14978 git-pull: do not mention --quiet and --verbose twice
14981 git-cvsserver: no longer use deprecated 'git-subcommand' commands
14984 clone: disconnect transport after fetching
14985 push: fix english in non-fast-forward message
14986 push: re-flow non-fast-forward message
14988 Junio C Hamano (1):
14992 svn: properly escape arguments for authors-prog
14995 git-clone: add missing comma in --reference documentation
14998 http.c: remove verification of remote packs
15001 Version v1.6.4.2; changes since v1.6.4.1:
15002 -----------------------------------------
15005 Minor improvement to the write-tree documentation
15008 Round-down years in "years+months" relative date view
15011 add tests for merge message headings
15012 merge: fix incorrect merge message for ambiguous tag/branch
15013 merge: indicate remote tracking branches in merge message
15015 Johannes Schindelin (2):
15016 Expose the has_non_ascii() function
15017 Correctly mark cover letters' encodings if they are not pure ASCII
15020 t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite
15022 Junio C Hamano (3):
15023 apply: notice creation/removal patches produced by GNU diff
15024 clean: require double -f options to nuke nested git repository and work tree
15027 Kirill Smelkov (1):
15028 git add -p: demonstrate failure when staging both mode and hunk
15031 lstat_cache: guard against full match of length of 'name' parameter
15034 git-log: allow --decorate[=short|full]
15036 Linus Torvalds (1):
15037 git-checkout: be careful about untracked symlinks
15039 Nanako Shiraishi (3):
15040 git-bisect: call the found commit "*the* first bad commit"
15041 Fix overridable written with an extra 'e'
15042 Remove unused t/t8005/iso8859-5.txt
15044 Pickens, James E (1):
15045 Demonstrate bugs when a directory is replaced with a symlink
15048 http.c: don't assume that urls don't end with slash
15049 http.c: set slot callback members to NULL when releasing object
15052 add -p: do not attempt to coalesce mode changes
15054 Wesley J. Landaker (1):
15055 Documentation: git-archive: mark --format as optional in summary
15058 Version v1.6.4.1; changes since v1.6.4:
15059 ---------------------------------------
15061 Björn Steinbrink (1):
15062 config: Keep inner whitespace verbatim
15064 Erik Faye-Lund (1):
15065 send-email: remove debug trace
15067 Jakub Narębski (1):
15068 gitweb/README: Document $base_url
15071 show: suppress extra newline when showing annotated tag
15072 show: add space between multiple items
15073 docs: describe impact of repack on "clone -s"
15076 Documentation: git submodule: add missing options to synopsis
15079 help.c: give correct structure's size to memset()
15081 Johannes Schindelin (1):
15082 filter-branch: add an example how to add ACKs to a range of commits
15084 Junio C Hamano (5):
15085 merge-recursive: don't segfault while handling rename clashes
15086 t5510: harden the way verify-pack is used
15087 verify-pack -v: do not report "chain length 0"
15088 am: allow individual e-mail files as input
15092 git-instaweb: fix mod_perl detection for apache2
15095 Better usage string for reflog.
15096 push: point to 'git pull' and 'git push --force' in case of non-fast forward
15097 filter-branch: make the usage string fit on 80 chars terminals.
15100 hg-to-git: don't import the unused popen2 module
15103 don't let the delta cache grow unbounded in 'git repack'
15105 Nicolas Sebrecht (1):
15106 git-am: print fair error message when format detection fails
15109 Change mentions of "git programs" to "git commands"
15112 Documentation: merge: one <remote> is required
15113 Documentation: add: <filepattern>... is optional
15116 t5520-pull: Test for rebased upstream + fetch + pull --rebase
15117 pull: support rebased upstream + fetch + pull --rebase
15120 gitweb: parse_commit_text encoding fix
15123 Fix typos in git-remote.txt and git-symbolic-ref.txt
15126 Version v1.6.4; changes since v1.6.4-rc3:
15127 -----------------------------------------
15130 Update the documentation of the raw diff output format
15133 fast-export: Set revs.topo_order before calling setup_revisions
15134 fast-export: Omit tags that tag trees
15135 fast-export: Make sure we show actual ref names instead of "(null)"
15136 fast-export: Do parent rewriting to avoid dropping relevant commits
15137 fast-export: Add a --tag-of-filtered-object option for newly dangling tags
15138 Add new fast-export testcases
15139 fast-export: Document the fact that git-rev-list arguments are accepted
15142 t9143: do not fail if Compress::Zlib is missing
15145 Fix rebase -p --onto
15147 Junio C Hamano (2):
15151 Michael J Gruber (1):
15152 git-rerere.txt: Clarify ambiguity of the config variable
15154 Sean Estabrooks (1):
15155 Trivial path quoting fixes in git-instaweb
15158 config.txt: document add.ignore-errors
15161 request-pull: allow ls-remote to notice remote.$nickname.uploadpack
15164 Version v1.6.4-rc3; changes since v1.6.4-rc2:
15165 ---------------------------------------------
15168 Make section_name_match start on '[', and return the length on success
15169 After renaming a section, print any trailing variable definitions
15171 Björn Steinbrink (1):
15172 Add a test showing that 'git repack' throws away grafted-away parents
15174 Daniel Trstenjak (1):
15175 Show the presence of untracked files in the bash prompt.
15178 git svn: fix shallow clone when upstream revision is too new
15179 git svn: revert default behavior for --minimize-url
15180 git svn: the branch command no longer needs the full path
15181 t9142: stop httpd after the test
15182 git svn: avoid escaping '/' when renaming/copying files
15183 git svn: make minimize URL more reliable over http(s)
15186 send-email: detect cycles in alias expansion
15188 Johannes Schindelin (1):
15189 git repack: keep commits hidden by a graft
15191 Junio C Hamano (6):
15192 do_one_ref(): null_sha1 check is not about broken ref
15193 SunOS grep does not understand -C<n> nor -e
15194 Update release notes for 1.6.4
15195 Fix severe breakage in "git-apply --whitespace=fix"
15196 t8005: Nobody writes Russian in shift_jis
15199 Linus Torvalds (3):
15200 git branch: fix performance problem
15201 git branch: avoid unnecessary object lookups
15202 git branch: clean up detached branch handling
15204 Matthias Andree (1):
15205 Fix export_marks() error handling.
15207 Nanako Shiraishi (1):
15208 Documentation/config.txt: a variable can be defined on the section header line
15211 git svn: add gc command
15214 Disable asciidoc 8.4.1+ semantics for `{plus}` and friends
15217 Version v1.6.4-rc2; changes since v1.6.4-rc1:
15218 ---------------------------------------------
15221 refs.c: release file descriptor on error return
15222 sha1_name.c: avoid unnecessary strbuf_release
15223 configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests
15224 configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing
15227 git svn: rename tests that had conflicting numbers
15228 git svn: fix reparenting when ugly http(s) URLs are used
15230 Junio C Hamano (5):
15231 checkout -f: deal with a D/F conflict entry correctly
15232 push: do not give big warning when no preference is configured
15233 Updates to draft release notes to 1.6.4
15234 combine-diff.c: fix performance problem when folding common deleted lines
15235 diff --cc: a lost line at the beginning of the file is shown incorrectly
15237 Martin Koegler (1):
15238 git stash: modernize use of "dashed" git-XXX calls
15240 Michael J Gruber (1):
15241 t4202-log.sh: Test git log --no-walk sort order
15244 cvsexportcommit: reorder tests to quiet intermittent failure
15246 Pierre Habouzit (4):
15247 janitor: use NULL and not 0 for pointers.
15248 refactor: use bitsizeof() instead of 8 * sizeof()
15249 janitor: add DIV_ROUND_UP and use it.
15250 janitor: useless checks before free
15253 Trailing whitespace and no newline fix
15256 List send-email config options in config.txt.
15257 Improve doc for format-patch threading options.
15260 Version v1.6.4-rc1; changes since v1.6.4-rc0:
15261 ---------------------------------------------
15263 Andreas Ericsson (1):
15264 mailinfo: Remove only one set of square brackets
15267 unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5
15268 git-compat-util.h: adjust for SGI IRIX 6.5
15269 Makefile: add NEEDS_LIBGEN to optionally add -lgen to compile arguments
15270 Makefile: add section for SGI IRIX 6.5
15271 Makefile: update IRIX64 section
15274 git svn: allow uppercase UUIDs from SVN
15277 quickfetch(): Prevent overflow of the rev-list command line
15279 Junio C Hamano (2):
15280 Makefile: keep "git" when bindir is execdir
15281 Revert "mailinfo: Remove only one set of square brackets"
15283 Linus Torvalds (10):
15284 Add 'fill_directory()' helper function for directory traversal
15285 Simplify read_directory[_recursive]() arguments
15286 Avoid doing extra 'lstat()'s for d_type if we have an up-to-date cache entry
15287 Avoid using 'lstat()' to figure out directories
15288 Prepare symlink caching for thread-safety
15289 Export thread-safe version of 'has_symlink_leading_path()'
15290 Make index preloading check the whole path to the file
15291 Make 'git show' more useful
15292 Improve on the 'invalid object' error message at commit time
15293 Fix extraneous lstat's in 'git checkout -f'
15295 Mattias Nissler (2):
15296 git-svn: Always duplicate paths returned from get_log
15297 git-svn: Fix branch detection when repository root is inaccessible
15300 Document 'git (rev-list|log) --merges'
15301 bash: add '--merges' to common 'git log' options
15303 Wincent Colaiuta (1):
15304 gitweb: update Git homepage URL
15307 Version v1.6.4-rc0; changes since v1.6.3.4:
15308 -------------------------------------------
15311 Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS working tree before applying commit patch
15314 Quote LF in urls git fetch saves in FETCH_HEAD
15315 Use UTF-8 instead of utf8 for backward compatibility
15316 Improve the naming of guessed target repository for git clone
15319 git-svn: Fix for svn paths removed > log-window-size revisions ago
15320 git-svn: Correctly report max revision when following deleted paths
15321 git-svn: Set svn.authorsfile if it is passed to git svn clone
15324 graph API: Use horizontal lines for more compact graphs
15326 Andreas Ericsson (1):
15327 fetch: Strip usernames from url's before storing them
15330 Add 'git svn help [cmd]' which works outside a repo.
15331 git-svn: speed up find_rev_before
15332 Add 'git svn reset' to unwind 'git svn fetch'
15334 Benjamin Kramer (1):
15335 imap-send: add support for IPv6
15338 builtin-remote: (get_one_entry): use strbuf
15340 Björn Steinbrink (1):
15341 git-apply(1): Clarify that one can select where to apply the patch
15343 Brandon Casey (23):
15344 t3900: use ancient iconv names for backward compatibility
15345 Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility
15346 builtin-mailinfo.c: compare character encodings case insensitively
15347 builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as fallback encoding
15348 t3901: avoid negation on right hand side of '|'
15349 t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibility
15350 t9301: use ISO8859-1 rather than ISO-8859-1
15351 t5100: use ancient encoding syntax for backwards compatibility
15352 t8005: use more portable character encoding names
15353 t8005: convert CP1251 character set to ISO8859-5
15354 t8005: fix typo, it's ISO-8859-5, not KOI8-R
15355 Makefile: use /usr/ucb/install on SunOS platforms rather than ginstall
15356 Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments
15357 On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec
15358 git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
15359 Makefile: define __sun__ on SunOS
15360 Makefile: add section for SunOS 5.7
15361 git-compat-util.h: avoid using c99 flex array feature with Sun compiler 5.8
15362 git-send-email.perl: improve detection of MIME encoded-words
15363 send-email: use UTF-8 rather than utf-8 for consistency
15364 Makefile: Solaris needs HAVE_ALLOCA_H for alloca()
15365 t/t9001-send-email.sh: ensure generated script is executed with $SHELL_PATH
15366 git.c: avoid allocating one-too-many elements for new argv array
15368 Christian Couder (30):
15369 rev-list: make "estimate_bisect_steps" non static
15370 rev-list: refactor printing bisect vars
15371 bisect: move common bisect functionality to "bisect_common"
15372 bisect--helper: add "--next-exit" to output bisect results
15373 bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"
15374 bisect--helper: remove "--next-vars" option as it is now useless
15375 rev-list: remove stringed output flag from "show_bisect_vars"
15376 rev-parse: add --sq-quote to shell quote arguments
15377 bisect: use "git rev-parse --sq-quote" instead of a custom "sq" function
15378 am: simplify "sq" function by using "git rev-parse --sq-quote"
15379 bisect: use "sha1_array" to store skipped revisions
15380 bisect: implement "rev_argv_push" to fill an argv with revs
15381 bisect: store good revisions in a "sha1_array"
15382 bisect: use new "struct argv_array" to prepare argv for "setup_revisions"
15383 bisect: remove too much function nesting
15384 bisect: make skipped array functions more generic
15385 bisect: automatically sort sha1_array if needed when looking it up
15386 bisect: implement the "check_merge_bases" function
15387 bisect: add "check_good_are_ancestors_of_bad" function
15388 bisect: make "git bisect" use new "--next-all" bisect-helper function
15389 bisect: rework some rev related functions to make them more reusable
15390 commit: add function to unparse a commit and its parents
15391 bisect: check ancestors without forking a "git rev-list" process
15392 bisect: drop unparse_commit() and use clear_commit_marks()
15393 bisect: display first bad commit without forking a new process
15394 bisect: add parameters to "filter_skipped"
15395 bisect: when skipping, choose a commit away from a skipped commit
15396 t6030: test skipping away from an already skipped commit
15397 bisect: use a PRNG with a bias when skipping away from untestable commits
15398 Documentation: remove warning saying that "git bisect skip" may slow bisection
15400 Christian Stimming (1):
15401 gitk: Update German translation.
15403 Clemens Buchacher (5):
15404 http-push: reuse existing is_null_ref
15405 match_refs: search ref list tail internally
15406 test-lib: fail if invalid options are passed
15407 test-lib: allow exit trap to be used for cleanup by tests
15408 test-lib: fix http exit codes
15411 Unify signedness in hashing calls
15413 Daniel Trstenjak (1):
15414 Show presence of stashed changes in bash prompt.
15417 mergetool--lib: specialize diff options for emerge and ecmerge
15418 mergetool--lib: add support for araxis merge
15419 compat: add a mkstemps() compatibility function
15420 compat: add a basename() compatibility function
15421 diff: generate pretty filenames in prep_temp_blob()
15423 Dirk Süsserott (1):
15424 gitk: Add option 'Simple history' to the options menu
15426 Edward Z. Yang (1):
15427 connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
15430 gitk: Make more options easily accessible from Edit View dialog
15432 Eric W. Biederman (1):
15433 git-send-email: Handle quotes when parsing .mailrc files
15436 git-svn: refuse to dcommit non-UTF-8 messages
15437 git-svn: convert globs to regexps for branch destinations
15438 t9138: remove stray dot in test which broke bash
15439 Allow the Unix epoch to be a valid commit date
15441 Eygene Ryabinkin (1):
15442 git-svn testsuite: use standard configuration for Subversion tools
15444 Felipe Contreras (2):
15445 Change prettify_ref to prettify_refname
15446 Prettify log decorations even more
15448 Frank Lichtenheld (2):
15449 Git.pm: Set GIT_WORK_TREE if we set GIT_DIR
15450 Git.pm: Always set Repository to absolute path if autodetecting
15452 Giuseppe Bilotta (11):
15453 git-am foreign patch support: introduce patch_format
15454 git-am foreign patch support: autodetect some patch formats
15455 git-am foreign patch support: StGIT support
15456 git-am: refactor 'cleaning up and aborting'
15457 gitweb: refactor author name insertion
15458 gitweb: uniform author info for commit and commitdiff
15459 gitweb: use git_print_authorship_rows in 'tag' view too
15460 gitweb: (gr)avatar support
15461 gitweb: gravatar url cache
15462 gitweb: picon avatar provider
15463 gitweb: add empty alt text to avatar img
15466 Extend sample update hook, disable modifying of existing tags
15467 Extend sample pre-commit hook to check for non ascii filenames
15469 Hunter, D. Seth (1):
15470 http-push: fix xml_entities() string parsing overrun
15472 Jakub Narębski (10):
15473 gitweb: Remove function prototypes (cleanup)
15474 gitweb: Do not use bareword filehandles
15475 gitweb: Always use three argument form of open
15476 gitweb: Always use three argument form of open
15477 gitweb: Use block form of map/grep in a few cases more
15478 gitweb: Replace wrongly added tabs with spaces
15479 gitweb: Use capturing parentheses only when you intend to capture
15480 gitweb: Simplify snapshot format detection logic in evaluate_path_info
15481 gitweb: Remove unused $hash_base parameter from normalize_link_target
15482 gitweb: Sanitize title attribute in format_subject_html
15485 parseopt: add OPT_NEGBIT
15486 convert bare readlink to strbuf_readlink
15487 git-add: no need for -f when resolving a conflict in already tracked path
15488 Makefile: refactor regex compat support
15489 Makefile: use compat regex on Solaris
15490 log-tree: fix confusing comment
15491 Makefile: install 'git' in execdir
15494 post-receive-email: hooks.showrev: show how to include both web link and patch
15495 avoid NULL dereference on failed malloc
15498 Rename submodule.<name>.rebase to submodule.<name>.update
15499 git-submodule: add support for --merge.
15501 Johannes Schindelin (12):
15502 git-add: introduce --edit (to edit the diff vs. the index)
15503 t3702: fix reliance on SHELL_PATH being '/bin/sh'
15504 MinGW: the path separator to split GITPERLLIB is ';' on Win32
15505 MinGW: use POSIX signature of waitpid()
15506 MinGW: Add a simple getpass()
15507 MinGW: Fix compiler warning in merge-recursive
15508 MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
15509 Quiet make: do not leave Windows behind
15510 Work around a regression in Windows 7, causing erase_in_line() to crash sometimes
15511 test-chmtime: work around Windows limitation
15512 MinGW: fix warning about implicit declaration of _getch()
15513 Fix warnings in nedmalloc when compiling with GCC 4.4.0
15515 Johannes Sixt (10):
15516 gitk: Use --textconv to generate diff text
15517 Simplify some instances of run_command() by using run_command_v_opt().
15518 Simplify some 'fprintf(stderr); return -1;' by using 'return error()'
15519 Fix typo in nedmalloc warning fix
15520 compat/ has subdirectories: do not omit them in 'make clean'
15521 daemon: send stderr of service programs to the syslog
15522 upload-pack: squelch progress indicator if client cannot see it
15523 receive-pack: do not send error details to the client
15524 git-mv: fix directory separator treatment on Windows
15525 MinGW: truncate exit()'s argument to lowest 8 bits
15528 mktree --missing: updated usage message and man page
15529 mktree --batch: build more than one tree object
15530 mktree: validate entry type in input
15532 Junio C Hamano (22):
15533 Start 1.6.4 development
15534 build-in git-mktree
15535 mktree: use parse-options
15536 builtin-mktree.c: use a helper function to handle one line of input
15537 mktree: do not barf on a submodule commit
15538 t1010: add mktree test
15539 mktree --missing: allow missing objects
15540 t3900: ISO-2022-JP has more than one popular variants
15541 write-tree --ignore-cache-tree
15542 Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
15543 OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
15544 cache-tree.c::cache_tree_find(): simplify internal API
15545 t4007: modernize the style
15546 Optimize "diff-index --cached" using cache-tree
15547 Avoid "diff-index --cached" optimization under --find-copies-harder
15548 Update draft release notes to 1.6.4
15549 completion: fix PS1 display during an AM on detached HEAD
15550 Documentation/git.txt: update links to release notes
15551 Makefile: introduce SANE_TOOL_PATH for prepending required elements to PATH
15552 Makefile: test-parse-options depends on parse-options.h
15553 Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
15554 die_errno(): double % in strerror() output just in case
15557 symlinks.c: small style cleanup
15560 add --porcelain option to git-push
15562 Linus Torvalds (3):
15563 Clean up and simplify rev_compare_tree()
15564 Fix various sparse warnings in the git source code
15565 git log: add '--merges' flag to match '--no-merges'
15567 Marc Branchaud (3):
15568 git svn: Support multiple branch and tag paths in the svn repository.
15569 git svn: cleanup t9138-multiple-branches
15570 git svn: Doc update for multiple branch and tag paths
15572 Marius Storm-Olsen (2):
15573 MinGW readdir reimplementation to support d_type
15574 Add custom memory allocator to MinGW and MacOS builds
15577 git-svn: add --authors-prog option
15578 http.c: prompt for SSL client certificate password
15579 http.c: add http.sslCertPasswordProtected option
15581 Markus Heidelberg (10):
15582 show-branch: color the commit status signs
15583 bash completion: show-branch color support
15584 diff: do not color --stat output like patch context
15585 gitk: Allow diff view without context lines
15586 add a test for git-send-email for non-threaded mails
15587 send-email: fix non-threaded mails
15588 doc/send-email: clarify the behavior of --in-reply-to with --no-thread
15589 add a test for git-send-email for threaded mails without chain-reply-to
15590 send-email: fix threaded mails without chain-reply-to
15591 send-email: fix a typo in a comment
15594 Remove filename from conflict markers
15596 Michael J Gruber (9):
15597 Documentation: clarify / requirement in 'git check-ref-format'
15598 Test tracking of non-commit upstreams
15599 Fix behavior with non-commit upstream references
15600 Allow push and fetch urls to be different
15601 t5516: Check pushurl config setting
15602 technical/api-remote: Describe new struct remote member pushurl
15603 git-repack.txt: Clarify implications of -a for dumb protocols
15604 builtin-remote: Show push urls as well
15605 builtin-remote: Make "remote -v" display push urls
15607 Michael S. Tsirkin (1):
15608 Add --reference option to git submodule.
15610 Michael Witten (6):
15611 Docs: send-email: Put options back into alphabetical order
15612 Docs: send-email: Refer to CONFIGURATION section for sendemail.multiedit
15613 Docs: send-email: --smtp-server-port can take symbolic ports
15614 send-email: Handle "GIT:" rather than "GIT: " during --compose
15615 send-email: 'References:' should only reference what is sent
15616 send-email: Remove superfluous `my $editor = ...'
15619 apply: handle filenames with double slashes better
15621 Michele Ballabio (1):
15622 gitk: Add another string to translation
15625 Don't expect verify_pack() callers to set pack_size
15626 transport.c::get_refs_via_curl(): do not leak refs_url
15627 http.c: new functions for the http API
15628 transport.c::get_refs_via_curl(): use the new http API
15629 http.c::http_fetch_ref(): use the new http API
15630 http-push.c::remote_exists(): use the new http API
15631 http-push.c::fetch_symref(): use the new http API
15633 Nguyễn Thái Ngọc Duy (3):
15634 doc/git-rebase.txt: remove mention of multiple strategies
15635 Terminate argv with NULL before calling setup_revisions()
15636 t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C
15639 diff-tree -r -t: include added/removed directories in the output
15642 git-cvsexportcommit can't commit files which have been removed from CVS
15643 Remove archaic use of regex capture \1 in favour of $1
15644 Avoid generating a warning if $fullname{$file} is undefined
15647 Test cccmd in t9001-send-email.sh and fix some bugs
15650 gitk: Handle msysGit version during version comparisons
15651 git: browsing paths with spaces when using the start command
15653 Paul Mackerras (1):
15654 gitk: Check git version before using --textconv flag
15657 MinGW: Scan for \r in addition to \n when reading shbang lines
15659 Peter Hutterer (1):
15660 git-submodule: add support for --rebase.
15662 Pierre Habouzit (1):
15663 parse-options: add parse_options_check to validate option specs.
15665 Ralf Wildenhues (1):
15666 configure: test whether -lresolv is needed
15669 parseopt: add OPT_NEGBIT
15670 parseopt: add OPT_NUMBER_CALLBACK
15671 parseopt: add PARSE_OPT_NODASH
15672 grep: remove global variable builtin_grep
15674 grep: make callback functions static
15675 userdiff: add xdiff_clear_find_func()
15676 grep: move context hunk mark handling into show_line()
15677 grep: print context hunk marks between files
15678 grep: handle pre context lines on demand
15679 grep: add option -p/--show-function
15680 grep -p: support user defined regular expressions
15681 grep: simplify -p output
15683 Robin Rosenberg (1):
15684 Disallow '\' in ref names
15687 bash: remove always true if statement from __git_ps1()
15688 Documentation: mention 'git stash pop --index' option explicitly
15689 bash: add support for 'git stash pop --index' option
15692 parse-remote: function to get the tracking branch to be merge
15693 parse-remote: support default reflist in get_remote_merge_branch
15694 parse-remote: remove unused functions
15696 Sitaram Chamarty (1):
15697 allow -t abbreviation for --track in git branch
15699 Steffen Prohaska (1):
15700 MinGW: Teach Makefile to detect msysgit and apply specific settings
15703 bash completion: complete variable names for "git config" with options
15704 format-patch: migrate to parse-options API
15705 parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's
15706 show-branch: migrate to parse-options API
15707 parse-opts: prepare for OPT_FILENAME
15708 parse-opts: add OPT_FILENAME and transition builtins
15709 t5500: Modernize test style
15710 t9120: don't expect failure with SVN_HTTPD_PORT unset
15711 config.txt: document add.ignore-errors
15712 git-show-branch.txt: document --date-order option
15713 parse-options: make OPT_INTEGER's argh explicit
15714 parse-options: simplify usage argh handling
15715 show-branch: don't use LASTARG_DEFAULT with OPTARG
15716 t4150: test applying with a newline in subject
15717 am: suppress apply errors when using 3-way
15718 git-sh-setup: introduce say() for quiet options
15719 submodule, repack: migrate to git-sh-setup's say()
15720 am, rebase: teach quiet option
15721 stash: teach quiet option
15722 show-ref: migrate to parse-options
15723 completion: add missing config variables
15724 completion: __git_config_get_set_variables() handle values with spaces
15726 Tay Ray Chuan (15):
15727 t5540-http-push: test fetching of loose objects
15728 t5540-http-push: test fetching of packed objects
15729 http-push: send out fetch requests on queue
15730 http-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue"
15731 t5550-http-fetch: test fetching of packed objects
15732 http-push, http-walker: style fixes
15733 http-walker: verify remote packs
15734 http*: copy string returned by sha1_to_hex
15735 http-push: do not SEGV after fetching a bad pack idx file
15736 http*: move common variables and macros to http.[ch]
15737 http: create function end_url_with_slash
15738 http*: add http_get_info_packs
15739 http: use new http API in fetch_index()
15740 http*: add helper methods for fetching packs
15741 http*: add helper methods for fetching objects (loose)
15744 Documentation: teach stash/pop workflow instead of stash/apply
15745 git-svn: let 'dcommit $rev' work on $rev instead of HEAD
15746 Introduce die_errno() that appends strerror(errno) to die()
15747 Convert existing die(..., strerror(errno)) to die_errno()
15748 Use die_errno() instead of die() when checking syscalls
15750 Todd Zullinger (1):
15751 completion: Add --full-diff to log options
15754 send-email: Add config option for sender address
15757 git-svn: Canonicalize svn urls to prevent libsvn assertion
15759 Uwe Kleine-König (2):
15760 more tests for git rev-parse --parse-opt
15761 parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse
15764 git-svn.txt: stop using dash-form of commands.
15765 git-svn.txt: make formatting more consistent.
15766 git-svn.txt: fix fetch flags incorrectly documented as init flags.
15767 git-svn.txt: fix description of fetch flags accepted by clone.
15770 Version v1.6.3.4; changes since v1.6.3.3:
15771 -----------------------------------------
15774 refs.c: release file descriptor on error return
15775 sha1_name.c: avoid unnecessary strbuf_release
15778 git-remote: fix missing .uploadpack usage for show command
15780 Clemens Buchacher (1):
15781 fetch: do not create ref from empty name
15783 Giuseppe Bilotta (1):
15784 gitweb/README: fix AliasMatch in example
15787 t3700-add: add a POSIXPERM prerequisite to a new test
15788 Makefile: git.o depends on library headers
15790 Junio C Hamano (9):
15791 request-pull: really disable pager
15792 checkout -f: deal with a D/F conflict entry correctly
15793 combine-diff.c: fix performance problem when folding common deleted lines
15794 diff --cc: a lost line at the beginning of the file is shown incorrectly
15795 do_one_ref(): null_sha1 check is not about broken ref
15796 SunOS grep does not understand -C<n> nor -e
15797 Fix severe breakage in "git-apply --whitespace=fix"
15798 t8005: Nobody writes Russian in shift_jis
15801 Linus Torvalds (3):
15802 git branch: fix performance problem
15803 git branch: avoid unnecessary object lookups
15804 git branch: clean up detached branch handling
15806 Matthias Andree (1):
15807 Fix export_marks() error handling.
15810 request-pull: really really disable pager
15813 git-submodule documentation: fix foreach example
15816 attr: plug minor memory leak
15819 fread does not return negative on error
15822 Trailing whitespace and no newline fix
15824 Sitaram Chamarty (1):
15825 Documentation: update description of shell aliases
15828 add: allow configurations to be overriden by command line
15829 config.txt: document add.ignore-errors
15831 Thadeu Lima de Souza Cascardo (1):
15832 Makes some cleanup/review in gittutorial
15835 Test git archive --remote
15836 Test grep --and/--or/--not
15839 request-pull: allow ls-remote to notice remote.$nickname.uploadpack
15842 Version v1.6.3.3; changes since v1.6.3.2:
15843 -----------------------------------------
15845 Anders Kaseorg (1):
15846 for-each-ref: Do not lookup objects when they will not be used
15848 Clemens Buchacher (1):
15849 refuse to merge during a merge
15852 use xstrdup, not strdup in ll-merge.c
15854 Johannes Schindelin (1):
15855 import-tars: support symlinks
15858 fetch-pack: close output channel after sideband demultiplexer terminates
15859 diff.c: plug a memory leak in an error path
15861 Junio C Hamano (3):
15862 t3505: fix abuse of test_expect_code
15863 attribute: whitespace set to true detects all errors known to git
15866 Linus Torvalds (1):
15867 Fix big left-shifts of unsigned char
15869 Marco Nelissen (1):
15870 fix handling of iconv configuration options
15873 http.c: fix compiling with libcurl 7.9.2
15875 Michael J Gruber (1):
15876 builtin-remote: Make "remote show" display all urls
15879 git-svn documentation: fix typo in 'rebase vs. pull/merge' section
15881 Nanako Shiraishi (1):
15882 .gitattributes: CR at the end of the line is an error
15885 Documentation: git-send-mail can take rev-list arg to drive format-patch
15886 avoid exponential regex match for java and objc function names
15889 upload-archive: fix infinite loop on Cygwin
15891 Shawn O. Pearce (1):
15892 daemon: Strictly parse the "extra arg" part of the command
15895 git-rerere.txt: grammatical fixups and cleanups
15896 pull, rebase: simplify to use die()
15897 git-show-ref.txt: remove word and make consistent
15900 http*: cleanup slot->local after fclose
15903 Documentation: refer to gitworkflows(7) from tutorial and git(1)
15905 Uwe Kleine-König (1):
15906 rebase--interactive: remote stray closing parenthesis
15909 Version v1.6.3.2; changes since v1.6.3.1:
15910 -----------------------------------------
15913 Introduce an unlink(2) wrapper which gives warning if unlink failed
15914 replace direct calls to unlink(2) with unlink_or_warn
15915 print unlink(2) errno in copy_or_link_directory
15916 Clarify kind of conflict in merge-one-file helper
15917 ls-tree manpage: use "unless" instead of "when ... is not"
15918 ls-tree manpage: output of ls-tree is compatible with update-index
15919 http-push.c::remove_locks(): fix use after free
15921 Charles Bailey (2):
15922 t6023: merge-file fails to output anything for a degenerate merge
15923 Change xdl_merge to generate output even for null merges
15925 Clemens Buchacher (1):
15926 fix segfault showing an empty remote
15929 Fix type-punning issues
15931 Daniel Cordero (1):
15932 builtin-checkout: Don't tell user that HEAD has moved before it has
15934 Dave Olszewski (1):
15935 merge-recursive: never leave index unmerged while recursing
15937 Giuseppe Bilotta (1):
15938 completion: use git rev-parse to detect bare repos
15941 fix GIT_TRACE segfault with shell-quoted aliases
15942 add: don't complain when adding empty project root
15943 for-each-ref: fix segfault in copy_email
15944 lock_ref: inform callers of unavailable ref
15945 fetch: report ref storage DF errors more accurately
15946 fix cat-file usage message and documentation
15949 format-patch let -k override a config-specified format.numbered
15950 pre-commit.sample: don't print incidental SHA1
15952 Johannes Schindelin (2):
15953 Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
15954 Cope better with a _lot_ of packs
15957 t3701: ensure correctly set up repository after skipped tests
15959 Junio C Hamano (8):
15960 Revert "git-add--interactive: remove hunk coalescing"
15961 completion: fix PS1 display during a merge on detached HEAD
15962 completion: simplify "current branch" in __git_ps1()
15963 completion: enhance "current branch" display
15964 Prepare for 1.6.3.2
15965 Update draft release notes for 1.6.3.2
15966 blame: correctly handle a path that used to be a directory
15969 Linus Torvalds (3):
15970 Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
15971 Teach 'git checkout' to preload the index contents
15972 dir.c: clean up handling of 'path' parameter in read_directory_recursive()
15975 Splitting a hunk that adds a line at the top fails in "add -p"
15977 Michael J Gruber (1):
15978 merge-options.txt: Clarify merge --squash
15980 Nanako Shiraishi (1):
15981 test: checkout shouldn't say that HEAD has moved if it didn't
15984 allow OFS_DELTA objects during a push
15987 grep: fix word-regexp colouring
15988 grep: fix word-regexp at the beginning of lines
15989 grep: fix colouring of matches with zero length
15990 grep: fix empty word-regexp matches
15993 api-parse-options.txt: use 'func' instead of 'funct'
15994 tests: Add tests for missing format-patch long options
15995 completion: add missing options to show-branch and show
15996 show-branch: Fix die message in parse_reflog_param()
15997 commit: -F overrides -t
15998 apply, fmt-merge-msg: use relative filenames
16001 Documentation: teach stash/pop workflow instead of stash/apply
16002 add -i: do not dump patch during application
16005 Turn on USE_ST_TIMESPEC for OpenBSD
16008 Version v1.6.3.1; changes since v1.6.3:
16009 ---------------------------------------
16012 Clarify kind of conflict in merge-one-file helper
16014 Alexander Potashev (1):
16015 Documentation: cloning to empty directory is allowed
16017 Felipe Contreras (1):
16018 git config: clarify --add and --get-color
16020 Junio C Hamano (4):
16021 Start 1.6.3.1 maintenance series.
16022 archive-tar.c: squelch a type mismatch warning
16023 Revert "checkout branch: prime cache-tree fully"
16027 Version v1.6.3; changes since v1.6.3-rc4:
16028 -----------------------------------------
16031 improve error message in config.c
16034 dir.c: Fix two minor grammatical errors in comments
16037 Work around BSD whose typeof(tv.tv_sec) != time_t
16040 t4018-diff-funcname: add cpp xfuncname pattern to syntax test
16041 t8005: use egrep when extended regular expressions are required
16042 t4118: add missing '&&'
16043 t4118: avoid sed invocation on file without terminating newline
16044 t/annotate-tests.sh: avoid passing a non-newline terminated file to sed
16045 t4200: remove two unnecessary lines
16046 t4200: convert sed expression which operates on non-text file to perl
16048 Junio C Hamano (4):
16051 git-clean doc: the command only affects paths under $(cwd)
16054 Nguyễn Thái Ngọc Duy (1):
16055 t4029: use sh instead of bash
16058 honor repack.usedeltabaseoffset when fetching packs
16060 Robin H. Johnson (1):
16061 git-svn: fix a sloppy Getopt::Long usage
16064 completion: add missing configuration variables to _git_config()
16065 completion: add {gui,diff,merge}tool, man, and pager config variables
16066 completion: complete values for help.format
16067 completion: complete values for log.date
16068 completion: complete values for send-email
16069 git-am.txt: add an 'a', say what 'it' is, simplify a sentence
16070 git-am.txt: Use date or value instead of time or timestamp
16071 git-am.txt: reword extra headers in message body
16074 Version v1.6.3-rc4; changes since v1.6.3-rc3:
16075 ---------------------------------------------
16078 git-gui: Update Russian translation
16079 improve error message in config.c
16080 gitk: Add Russian translation
16082 Alexander Gavrilov (3):
16083 git-gui: Fix post-commit status with subject in non-locale encoding
16084 git-gui: Avoid an infinite rescan loop in handle_empty_diff.
16085 git-gui: Support more git version notations.
16088 builtin-merge: fix a typo in an error message
16089 Documentation: fix a grammatical error in api-builtin.txt
16091 Benjamin Kramer (1):
16092 daemon.c: fix segfault on OS X
16094 Christian Stimming (1):
16095 gitk: Mark forgotten string for translation
16097 Daniel A. Steffen (2):
16098 gitk: Fixes for Mac OS X TkAqua
16099 git-gui: Fixes for Mac OS X TkAqua
16102 Makefile: installing git in cygwin 1.7.0
16103 doc: consistently use ASCIIDOC_EXTRA
16105 Felipe Contreras (2):
16106 git config: error when editing a repo config and not being in one
16107 Fix a bunch of pointer declarations (codestyle)
16110 git-gui: Ensure consistent usage of mergetool.keepBackup
16112 Giuseppe Bilotta (1):
16113 gitk: Provide a window icon if possible
16116 Makefile: fix NO_PERL bug with gitweb
16119 git-gui: Fix merge conflict display error when filename contains spaces
16120 git-gui: When calling post-commit hook wrong variable was cleared.
16121 git-gui: run post-checkout hook on checkout
16122 git-gui: run post-checkout hook after clone
16124 Joerg Bornemann (1):
16125 git-gui: fix use of undeclared variable diff_empty_count
16127 Johannes Schindelin (2):
16128 t5701: do not get stuck in empty-push/
16129 Rename core.unreliableHardlinks to core.createObject
16132 prune-packed: advanced progress even for non-existing fan-out directories
16134 Junio C Hamano (3):
16135 diff -c -p: do not die on submodules
16136 merge-recursive: do not die on a conflicting submodule
16139 Linus Torvalds (1):
16140 grep: fix segfault when "git grep '('" is given
16143 Add semicolon to curly brace group in main Makefile
16145 Markus Heidelberg (5):
16146 git-gui: don't hide the Browse button when resizing the repo chooser
16147 git-gui: fix deleting from the context menu with empty selection
16148 git-gui: use `git --html-path` to get the location of installed HTML docs
16149 git-gui (Win): make "Explore Working Copy" more robust
16150 git-gui (Win): make starting via "Git GUI Here" on .git/ possible
16152 Michele Ballabio (2):
16153 gitk: Mark some more strings for translation
16154 gitk: Map KP_Divide to focus the search box
16157 gitk: Handle blobs containing a DOS end-of-file marker
16158 gitk: Remember and restore the window state with the geometry
16159 gitk: Handle external diff tool with spaces in the path
16160 gitk: Avoid crash if closed while reading references
16162 Patrick Welche (1):
16163 NetBSD compilation fix
16165 Paul Mackerras (4):
16166 gitk: Add a way to mark a commit, plus a "find descendant" command
16167 gitk: Add a command to compare two strings of commits
16168 gitk: Make .gitk a hidden file under windows
16169 gitk: Fix compare-commits function when we have local changes
16172 Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
16175 ctype.c: fix typo in comment
16178 git-gui: various French translation fixes
16179 git-gui: minor spelling fix and string factorisation.
16182 SubmittingPatches: itemize and reflect upon well written changes
16185 gitk: Provide a 32x32 window icon based on the git logo
16187 Uwe Kleine-König (1):
16188 parseopt: fix documentation for --keep-dashdash
16191 Version v1.6.3-rc3; changes since v1.6.3-rc2:
16192 ---------------------------------------------
16194 Benjamin Kramer (1):
16195 connect: replace inet_ntop with getnameinfo
16198 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
16199 t7700-repack: repack -a now works properly, expect success from test
16201 Johannes Schindelin (1):
16202 Add an option not to use link(src, dest) && unlink(src) when that is unreliable
16204 Linus Torvalds (1):
16208 progress bar: round to the nearest instead of truncating down
16210 Sitaram Chamarty (1):
16211 Remove obsolete bug warning in man git-update-server-info
16213 Wesley J. Landaker (2):
16214 Documentation: git-clean: fix minor grammatical errors
16215 Documentation: git-clean: make description more readable
16218 Version v1.6.3-rc2; changes since v1.6.3-rc1:
16219 ---------------------------------------------
16222 Wait for git diff to finish in git difftool
16223 Explain seemingly pointless use of system in difftool
16226 t4202-log: extend test coverage of graphing
16227 graph API: fix extra space during pre_commit_line state
16228 graph API: fix a bug in the rendering of octopus merges
16231 Work around ash "alternate value" expansion bug
16233 Bill Pemberton (1):
16234 Add parsing of elm aliases to git-send-email
16236 Dan Loewenherz (1):
16237 Convert to use quiet option when available
16239 Erik Faye-Lund (4):
16240 test-suite: adding a test for fast-export with tag variants
16241 builtin-fast-export.c: turn error into warning
16242 builtin-fast-export.c: fix crash on tagged trees
16243 builtin-fast-export.c: handle nested tags
16245 Frank Lichtenheld (1):
16246 gitcvs-migration: Link to git-cvsimport documentation
16249 gitweb: Fix snapshots requested via PATH_INFO
16252 add-interactive: refactor mode hunk handling
16253 t7800: respect NO_PERL
16256 Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
16258 Johannes Schindelin (1):
16259 Fix off-by-one in read_tree_recursive
16262 Windows: Work around intermittent failures in mingw_rename
16263 Windows: Skip fstat/lstat optimization in write_entry()
16264 builtin-help: silently tolerate unknown keys
16265 remote.c: do not trigger remote.<name>.<var> codepath for two-level names
16267 Junio C Hamano (9):
16268 Speed up reflog pruning of unreachable commits
16270 read-tree A B: do not corrupt cache-tree
16271 Move prime_cache_tree() to cache-tree.c
16272 read-tree -m A B: prime cache-tree from the switched-to tree
16273 checkout branch: prime cache-tree fully
16274 Revert "stat_tracking_info(): only count real commits"
16275 Makefile: ignore perl/ subdirectory under NO_PERL
16278 Linus Torvalds (1):
16279 Clean up reflog unreachability pruning decision
16281 Markus Heidelberg (1):
16282 grep: don't support "grep.color"-like config options
16285 git add -p: new "quit" command at the prompt.
16286 Update git-add.txt according to the new possibilities of 'git add -p'.
16287 clone: add test for push on an empty clone.
16289 Michael J Gruber (2):
16290 test-lib.sh: Help test_create_repo() find the templates dir
16291 Fix more typos/spelling in comments
16293 Michał Kiedrowicz (3):
16294 tests: test applying criss-cross rename patch
16295 builtin-apply: keep information about files to be deleted
16296 tests: make test-apply-criss-cross-rename more robust
16299 builtin-remote: fix typo in option description
16300 Documentation: fix typos / spelling mistakes
16301 Fix typos / spelling in comments
16303 Nguyễn Thái Ngọc Duy (1):
16304 Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
16307 test-genrandom: Add newline to usage string
16308 config.txt: add missing format.{subjectprefix,cc,attach} variables
16309 Documentation: use lowercase for shallow and deep threading
16310 git-show-branch.txt: cleanup example description
16311 git-format-patch.txt: general rewordings and cleanups
16312 config.txt: add missing 'the's and make words plural
16313 config.txt: clarify sentences in the configuration and syntax sections
16314 config.txt: Make configuration paragraph more consistent
16316 Wesley J. Landaker (2):
16317 Documentation: git-svn: fix spurious bolding that mangles the output
16318 Documentation: git-svn: fix a grammatical error without awkwardness
16320 Wincent Colaiuta (1):
16321 git add -p: add missing "q" to patch prompt
16324 Version v1.6.3-rc1; changes since v1.6.3-rc0:
16325 ---------------------------------------------
16328 graph API: Added logic for colored edges
16331 shorten_unambiguous_ref(): add strict mode
16332 for-each-ref: utilize core.warnAmbiguousRefs for :short-format
16333 rev-parse: --abbrev-ref option to shorten ref name
16335 David Aguilar (11):
16336 difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
16337 difftool: remove the backup file feature
16338 difftool: use perl built-ins when testing for msys
16339 difftool: add a -y shortcut for --no-prompt
16340 difftool: move 'git-difftool' out of contrib
16341 difftool: add various git-difftool tests
16342 difftool: add support for a difftool.prompt config variable
16343 bash completion: add git-difftool
16344 mergetool: use $( ... ) instead of `backticks`
16345 difftool/mergetool: refactor commands to use git-mergetool--lib
16346 mergetool--lib: simplify API usage by removing more global variables
16349 git-shell: Add 'git-upload-archive' to allowed commands.
16352 Fix misspelled mergetool.keepBackup
16354 Frank Lichtenheld (1):
16355 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
16358 doc: clarify --no-track option
16359 doc: refer to tracking configuration as "upstream"
16360 doc/checkout: refer to git-branch(1) as appropriate
16361 doc/checkout: split checkout and branch creation in synopsis
16362 docs/checkout: clarify what "non-branch" means
16363 add-interactive: refactor mode hunk handling
16364 doc/gitattributes: clarify location of config text
16367 t1301-shared-repo: fix forced modes test
16369 Junio C Hamano (4):
16370 gitignore git-bisect--helper
16371 unpack-trees: do not muck with attributes when we are not checking out
16372 Describe fixes since 1.6.2.3
16373 Update draft release notes to 1.6.3
16375 Linus Torvalds (3):
16376 Allow users to un-configure rename detection
16377 process_{tree,blob}: show objects without buffering
16378 show_object(): push path_name() call further down
16380 Markus Heidelberg (5):
16381 doc/merge-config: list ecmerge as a built-in merge tool
16382 git-mergetool/difftool: make (g)vimdiff workable under Windows
16383 git-mergetool: add new merge tool TortoiseMerge
16384 doc/git-daemon: add missing arguments to options
16385 doc/git-daemon: add missing arguments to max-connections option
16388 git add -p: new "quit" command at the prompt.
16389 Update git-add.txt according to the new possibilities of 'git add -p'.
16391 Michael J Gruber (1):
16392 remote.c: use shorten_unambiguous_ref
16394 Michał Kiedrowicz (3):
16395 tests: test applying criss-cross rename patch
16396 builtin-apply: keep information about files to be deleted
16397 Documentation: boolean value may be given by on/off
16399 Nanako Shiraishi (1):
16400 git-am: teach git-am to apply a patch to an unborn branch
16402 Nguyễn Thái Ngọc Duy (3):
16403 get_local_heads(): do not return random pointer if there is no head
16404 attr: add GIT_ATTR_INDEX "direction"
16405 archive: do not read .gitattributes in working directory
16408 imap-send: use correct configuration variable in documentation
16410 Pierre Habouzit (1):
16411 hook/update: example of how to prevent branch creation
16414 archive tests: do not use .gitattributes in working directory
16415 archive test: attributes
16417 Sebastian Pipping (1):
16418 difftool/mergetool: add diffuse as merge and diff tool
16420 Thomas Jarosch (1):
16421 Fix buffer overflow in config parser
16424 git-apply: fix option description
16427 Version v1.6.3-rc0; changes since v1.6.2.5:
16428 -------------------------------------------
16431 disable post-checkout test on Cygwin
16432 Produce a nicer output in case of sha1_object_info failures in ls-tree -l
16433 Microoptimize strbuf_cmp
16434 Improve error message about fetch into current branch
16436 Ali Gholami Rudi (2):
16437 builtin-clone.c: make junk_pid static
16438 builtin-clone.c: no need to strdup for setenv
16441 Do not name "repo" struct "remote" in push_http.c
16442 http-push.c: use a faux remote to pass to http_init
16444 Arjen Laarhoven (2):
16445 Clean up use of ANSI color sequences
16446 builtin-branch.c: Rename branch category color names
16449 bash completion: add options for 'git fsck'
16452 git-svn: Add per-svn-remote ignore-paths config
16453 git-svn: Save init/clone --ignore-paths in config
16456 configure: ensure settings from user are also usable in the script
16457 configure: reorganize flow of argument checks
16458 configure: add macros to stash FLAG variables
16459 configure: wrap some library tests with GIT_STASH_FLAGS
16460 configure: asciidoc version test cleanup
16461 configure: make iconv tests aware of user arguments
16462 configure: rework pthread handling to allow for user defined flags
16463 documentation: Makefile accounts for SHELL_PATH setting
16465 Benjamin Kramer (4):
16466 Remove unused function scope local variables
16467 Move local variables to narrower scopes
16468 Remove unused assignments
16469 Fix various dead stores found by the clang static analyzer
16471 Björn Steinbrink (1):
16472 Mailmap: Allow empty email addresses to be mapped
16475 git-svn: speed up blame command
16478 builtin-send-pack.c: avoid empty structure initialization
16480 Brian Gernhardt (2):
16481 Create USE_ST_TIMESPEC and turn it on for Darwin
16482 Makefile: Set compiler switch for USE_NSEC
16484 Carlos Manuel Duclos Vergara (1):
16485 git-archive: add --output=<file> to send output to a file
16488 config: test for --replace-all with one argument and fix documentation.
16490 Chris Johnsen (13):
16491 git-push.txt: describe how to default to pushing only current branch
16492 Documentation: remove extra quoting/emphasis around literal texts
16493 Documentation/Makefile: make most operations "quiet"
16494 Documentation/Makefile: break up texi pipeline
16495 Documentation: move callouts.xsl to manpage-{base,normal}.xsl
16496 Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl
16497 Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff
16498 Documentation: move quieting params into manpage-base.xsl
16499 Documentation: move "spurious .sp" code into manpage-base.xsl
16500 Documentation: asciidoc.conf: always use <literallayout> for [blocktext]
16501 Documentation: asciidoc.conf: fix verse block with block titles
16502 Documentation: option to render literal text as bold for manpages
16503 Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set
16505 Christian Couder (24):
16506 rev-list: estimate number of bisection step left
16507 log-tree: fix patch filename computation in "git format-patch"
16508 quote: implement "sq_dequote_many" to unwrap many args in one string
16509 quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array
16510 refs: add "for_each_ref_in" function to refactor "for_each_*_ref" functions
16511 rev-list: make "bisect_list" variable local to "cmd_rev_list"
16512 rev-list: move bisect related code into its own file
16513 rev-list: move code to show bisect vars into its own function
16514 rev-list: make "show_bisect_vars" non static
16515 rev-list: pass "revs" to "show_bisect_vars"
16516 sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1
16517 patch-ids: use the new generic "sha1_pos" function to lookup sha1
16518 bisect: improve error message when branch checkout fails
16519 rev-list: call new "filter_skip" function
16520 bisect: use the new generic "sha1_pos" function to lookup sha1
16521 bisect--helper: implement "git bisect--helper"
16522 bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES"
16523 bisect: use "bisect--helper" and remove "filter_skipped" function
16524 t6030: test bisecting with paths
16525 rev-list: pass "int flags" as last argument of "show_bisect_vars"
16526 bisect--helper: string output variables together with "&&"
16527 list-objects: add "void *data" parameter to show functions
16528 rev-list: remove last static vars used in "show_commit"
16529 rev-list: add "int bisect_show_flags" in "struct rev_list_info"
16532 Update delta compression message to be less misleading
16534 Daniel Barkalow (8):
16535 Make clone parse the default refspec with the normal code
16536 Use a single function to match names against patterns
16537 Use the matching function to generate the match results
16538 Keep '*' in pattern refspecs
16539 Support '*' in the middle of a refspec
16540 Use a common function to get the pretty name of refs
16541 Move push matching and reporting logic into transport.c
16542 Include log_config module in apache.conf
16545 contrib/difftool: use a separate config namespace for difftool commands
16548 add -i: revisit hunk on editor failure
16551 git-filter-branch: avoid collisions with variables in eval'ed commands
16552 Correct missing SP characters in grammar comment at top of fast-import.c
16553 fast-export: Avoid dropping files from commits
16556 config.txt: Describe special 'none' handling in core.gitProxy.
16559 git-svn: fix ls-tree usage with dash-prefixed paths
16561 Erik Faye-Lund (5):
16562 connect.c: remove a few globals by using git_config callback data
16563 test-suite: adding a test for fast-export with tag variants
16564 builtin-fast-export.c: turn error into warning
16565 builtin-fast-export.c: fix crash on tagged trees
16566 builtin-fast-export.c: handle nested tags
16568 Eugene Letuchy (1):
16569 Make git blame's date output format configurable, like git log
16571 Felipe Contreras (14):
16572 config: Add new option to open an editor.
16573 git config: codestyle cleanups
16574 git_config(): not having a per-repo config file is not an error
16575 git config: trivial rename in preparation for parseopt
16576 git config: reorganize get_color*
16577 git config: reorganize to use parseopt
16578 git config: don't allow multiple config file locations
16579 git config: don't allow multiple variable types
16580 git config: don't allow extra arguments for -e or -l.
16581 git config: don't allow --get-color* and variable type
16582 Add tests for git log --pretty, --format and --oneline.
16583 user-manual: remove some git-foo usage
16584 docbook: change css style
16585 user-manual: the name of the hash function is SHA-1, not sha1
16587 Finn Arne Gangstad (7):
16588 New config push.default to decide default behavior for push
16589 Display warning for default git push with no push.default config
16590 builtin-remote.c: Split out prune_remote as a separate function.
16591 git remote update: New option --prune
16592 git remote update: Report error for non-existing groups
16593 remote: New function remote_is_configured()
16594 git remote update: Fallback to remote if group does not exist
16596 Giuseppe Bilotta (1):
16597 import-tars: separate author from committer
16600 Add warning about known issues to documentation of cvsimport
16601 Cleanup warning about known issues in cvsimport documentation
16602 Add configuration variable for sign-off to format-patch
16605 MinGW: implement mmap
16608 git-svn: add fetch --parent option
16611 builtin-branch: improve output when displaying remote branches
16612 move duplicated get_local_heads() to remote.c
16613 move duplicated ref_newer() to remote.c
16614 move locate_head() to remote.c
16615 remote: simplify guess_remote_head()
16616 remote: make copy_ref() perform a deep copy
16617 remote: let guess_remote_head() optionally return all matches
16618 remote: make match_refs() copy src ref before assigning to peer_ref
16619 remote: make match_refs() not short-circuit
16620 string-list: new for_each_string_list() function
16621 builtin-remote: refactor duplicated cleanup code
16622 builtin-remote: remove unused code in get_ref_states
16623 builtin-remote: rename variables and eliminate redundant function call
16624 builtin-remote: make get_remote_ref_states() always populate states.tracked
16625 builtin-remote: fix two inconsistencies in the output of "show <remote>"
16626 builtin-remote: teach show to display remote HEAD
16627 builtin-remote: add set-head subcommand
16628 builtin-remote: new show output style
16629 builtin-remote: new show output style for push refspecs
16630 send-email: add --confirm option and configuration setting
16631 bash completion: fix completion issues with fetch, pull, and push
16632 bash completion: refactor --strategy completion
16633 bash completion: teach fetch, pull, and push to complete their options
16634 send-email: refactor and ensure prompting doesn't loop forever
16635 send-email: add tests for refactored prompting
16636 send-email: don't attempt to prompt if tty is closed
16637 send-email: ask_default should apply to all emails, not just the first
16638 send-email: correct two tests which were going interactive
16639 send-email: ensure quoted addresses are rfc2047 encoded
16640 send-email: fix nasty bug in ask() function
16643 valgrind: ignore ldso and more libz errors
16644 branch: clean up repeated strlen
16645 add basic branch display tests
16646 test scripts: refactor start_httpd helper
16647 add basic http clone/fetch tests
16648 refactor find_ref_by_name() to accept const list
16649 remote: make guess_remote_head() use exact HEAD lookup if it is available
16650 clone: run post-checkout hook when checking out
16651 improve missing repository error message
16652 config: set help text for --bool-or-int
16653 t3000: use test_cmp instead of diff
16654 ls-files: fix broken --no-empty-directory
16655 ls-files: require worktree when --deleted is given
16656 make oneline reflog dates more consistent with multiline format
16657 remote: improve sorting of "configure for git push" list
16658 Makefile: turn on USE_ST_TIMESPEC for FreeBSD
16659 t0060: fix whitespace in "wc -c" invocation
16660 tests: remove exit after test_done call
16661 for-each-ref: refactor get_short_ref function
16662 for-each-ref: refactor refname handling
16663 for-each-ref: add "upstream" format field
16664 make get_short_ref a public function
16665 branch: show upstream branch when double verbose
16666 Makefile: allow building without perl
16667 tests: skip perl tests if NO_PERL is defined
16668 add tests for remote groups
16671 githooks documentation: post-checkout hook is also called after clone
16674 Enable setting attach as the default in .gitconfig for git-format-patch.
16675 imap.preformattedHTML to tell Thunderbird to send non-flowed text
16677 Johannes Schindelin (23):
16678 Add valgrind support in test scripts
16679 Valgrind support: check for more than just programming errors
16680 test-lib.sh: optionally output to test-results/$TEST.out, too
16681 t/Makefile: provide a 'valgrind' target
16682 Add a script to coalesce the valgrind outputs
16683 Tests: let --valgrind imply --verbose and --tee
16684 test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
16685 valgrind: do not require valgrind 3.4.0 or newer
16686 Avoid segfault with 'git branch' when the HEAD is detached
16687 Turn the flags in struct dir_struct into a single variable
16688 git config: trivial cleanup for editor action
16689 rebase -i: avoid 'git reset' when possible
16690 MinGW: 64-bit file offsets
16691 Brown paper bag fix for MinGW 64-bit stat
16692 Add an (optional, since expensive) test for >2gb clones
16693 MinGW: fix diff --no-index /dev/null ...
16694 winansi: support ESC [ K (erase in line)
16695 test: do not LoadModule log_config_module unconditionally
16696 test-lib: write test results to test-results/<basename>-<pid>
16697 gc --aggressive: make it really aggressive
16698 t7300: fix clean up on Windows
16699 Guard a few Makefile variables against user environments
16700 git-svn: always initialize with core.autocrlf=false
16702 Johannes Sixt (30):
16703 recv_sideband: Bands #2 and #3 always go to stderr
16704 test-suite: Make test script numbers unique
16705 t9400, t9401: Do not force hard-linked clone
16706 test suite: Use 'say' to say something instead of 'test_expect_success'
16707 Call 'say' outside test_expect_success
16708 test-lib: Replace uses of $(expr ...) by POSIX shell features.
16709 test-lib: Simplify test counting.
16710 test-lib: Introduce test_chmod and use it instead of update-index --chmod
16711 t2200, t7004: Avoid glob pattern that also matches files
16712 t5300, t5302, t5303: Do not use /dev/zero
16713 t5602: Work around path mangling on MSYS
16714 test-lib: Work around incompatible sort and find on Windows
16715 test-lib: Work around missing sum on Windows
16716 Tests on Windows: $(pwd) must return Windows-style paths
16717 t0050: Check whether git init detected symbolic link support correctly
16718 test-lib: Infrastructure to test and check for prerequisites
16719 t3600: Use test prerequisite tags
16720 Skip tests that fail if the executable bit is not handled by the filesystem
16721 t5302: Use prerequisite tags to skip 64-bit offset tests
16722 t9100, t9129: Use prerequisite tags for UTF-8 tests
16723 Use prerequisite tags to skip tests that depend on symbolic links
16724 t0060: Fix tests on Windows
16725 Skip tests that require a filesystem that obeys POSIX permissions
16726 t3700: Skip a test with backslashes in pathspec
16727 Use prerequisites to skip tests that need unzip
16728 t7004: Use prerequisite tags to skip tests that need gpg
16729 t5503: GIT_DEBUG_SEND_PACK is not supported on MinGW
16730 MinGW: Quote arguments for subprocesses that contain a single-quote
16731 t7005-editor: Use $SHELL_PATH in the editor scripts
16732 t7502-commit: Skip SIGTERM test on Windows
16735 Modify description file to say what this file is
16736 Google has renamed the imap folder
16737 Improve error message for git-filter-branch
16738 Documentation - More examples for git bisect
16740 Junio C Hamano (29):
16741 git-blame: refactor code to emit "porcelain format" output
16742 blame: show "previous" information in --porcelain/--incremental format
16743 Make git-clone respect branch.autosetuprebase
16744 Draft release notes: Carry forward the warning for behaviour changes
16745 Update draft release notes to 1.6.3
16746 builtin-remote.c: no "commented out" code, please
16747 Not all systems use st_[cm]tim field for ns resolution file timestamp
16748 grep: cast printf %.*s "precision" argument explicitly to int
16749 http.c: style cleanups
16750 Improve "git branch --tracking" output
16751 http_init(): Fix config file parsing
16752 http authentication via prompts
16753 Update release notes to 1.6.3
16754 http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of cURL
16755 Read attributes from the index that is being checked out
16756 Update draft release notes to 1.6.3
16757 http tests: Darwin is not that special
16758 Rename interpret/substitute nth_last_branch functions
16759 strbuf_branchname(): a wrapper for branch name shorthands
16760 check-ref-format --branch: give Porcelain a way to grok branch shorthand
16761 Fix branch -m @{-1} newname
16762 strbuf_check_branch_ref(): a helper to check a refname for a branch
16763 check_ref_format(): tighten refname rules
16764 Update draft release notes to 1.6.3
16765 Speed up reflog pruning of unreachable commits
16766 Update draft release notes to 1.6.3
16767 sha1-lookup: fix up the assertion message
16768 Update draft release notes to 1.6.3
16772 Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking
16773 Fix neglect of diff_setup()/diff_setup_done() symmetry.
16776 builtin-push.c: Fix typo: "anythig" -> "anything"
16778 Kevin McConnell (1):
16779 Add --staged to bash completion for git diff
16781 Kjetil Barvik (18):
16782 lstat_cache(): small cleanup and optimisation
16783 lstat_cache(): generalise longest_match_lstat_cache()
16784 lstat_cache(): swap func(length, string) into func(string, length)
16785 unlink_entry(): introduce schedule_dir_for_removal()
16786 create_directories(): remove some memcpy() and strchr() calls
16787 write_entry(): cleanup of some duplicated code
16788 write_entry(): use fstat() instead of lstat() when file is open
16789 show_patch_diff(): remove a call to fstat()
16790 lstat_cache(): print a warning if doing ping-pong between cache types
16791 check_updates(): effective removal of cache entries marked CE_REMOVE
16792 fix compile error when USE_NSEC is defined
16793 make USE_NSEC work as expected
16794 verify_uptodate(): add ce_uptodate(ce) test
16795 write_index(): update index_state->timestamp after flushing to disk
16796 stat_tracking_info(): only count real commits
16797 Record ns-timestamps if possible, but do not use it without USE_NSEC
16798 checkout bugfix: use stat.mtime instead of stat.ctime in two places
16799 Revert "lstat_cache(): print a warning if doing ping-pong between cache types"
16801 Kristian Amlie (1):
16802 Add a test for checking whether gitattributes is honored by checkout.
16804 Linus Torvalds (2):
16805 Clean up reflog unreachability pruning decision
16806 Allow users to un-configure rename detection
16808 Marius Storm-Olsen (2):
16809 Add bare repository indicator for __git_ps1
16810 Fixup: Add bare repository indicator for __git_ps1
16812 Markus Heidelberg (1):
16813 add --html-path to get the location of installed HTML docs
16815 Martin Storsjö (1):
16816 Allow curl to rewind the read buffers
16819 git-send-email.txt: clarify which options take an argument.
16820 git-rev-list.txt: make ascii markup uniform with other pages.
16822 Michael Hendricks (1):
16823 format-patch: add arbitrary email headers
16825 Michael J Gruber (6):
16826 Typo and language fixes for git-checkout.txt
16827 test-lib.sh: Test for presence of git-init in the right path.
16828 test-lib.sh: Allow running the test suite against installed git
16829 git-branch.txt: document -f correctly
16830 Test for local branches being followed with --track
16831 Make local branches behave like remote branches when --tracked
16834 git-svn: support intermediate paths when matching tags/branches
16836 Michele Ballabio (6):
16837 apply: consistent spelling of "don't"
16838 apply: hide unused options from short help
16839 git log: avoid segfault with --all-match
16840 document --force-rebase
16841 rebase: add options passed to git-am
16842 rebase: fix typo (force_rebas -> force-rebas)
16845 Replace ",<,>,& with their respective XML entities in DAV requests
16848 parse-opt: migrate builtin-ls-files.
16849 Tests: use test_cmp instead of diff where possible
16850 http-push: using error() and warning() as appropriate
16851 builtin-apply: use warning() instead of fprintf(stderr, "warning: ")
16852 builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")
16853 builtin-fetch-pack: use warning() instead of fprintf(stderr, "warning: ")
16854 builtin-init-db: use warning() instead of fprintf(stderr, "warning: ")
16855 builtin-rm: use warning() instead of fprintf(stderr, "warning: ")
16856 builtin-show-branch: use warning() instead of fprintf(stderr, "warning: ")
16857 builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ")
16858 refs: use warning() instead of fprintf(stderr, "warning: ")
16860 Nanako Shiraishi (4):
16861 Add --format that is a synonym to --pretty
16862 Give short-hands to --pretty=tformat:%formatstring
16863 Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"
16864 Documentation/git.txt: GIT 1.6.2.2 has been out for a while
16867 format-patch: Respect --quiet option
16869 Nguyễn Thái Ngọc Duy (1):
16870 grep: prefer builtin over external one when coloring results
16873 git-p4: remove tabs from usermap file
16876 MinGW: a helper function that translates Win32 API error codes
16877 MinGW: a hardlink implementation
16879 Ramsay Allan Jones (1):
16880 git-instaweb: fix lighttpd configuration on cygwin
16883 grep: micro-optimize hit collection for AND nodes
16884 grep: remove grep_opt argument from match_expr_eval()
16885 grep: add pmatch and eflags arguments to match_one_pattern()
16886 grep: color patterns in output
16887 grep: add support for coloring with external greps
16888 parseopt: add PARSE_OPT_KEEP_UNKNOWN
16889 parseopt: add PARSE_OPT_NO_INTERNAL_HELP
16890 parseopt: make usage optional
16891 archive: use parseopt for local-only options
16892 parseopt: document KEEP_ARGV0, KEEP_UNKNOWN, NO_INTERNAL_HELP
16893 parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used together
16894 pickaxe: count regex matches only once
16897 rerere: remove duplicated functions
16900 Documentation: enhance branch.<name>.{remote,merge}
16901 Documentation: push.default applies to all remotes
16902 Documentation: branch.*.merge can also affect 'git-push'
16903 Documentation: Introduce "upstream branch"
16905 Shawn O. Pearce (1):
16906 Don't permit ref/branch names to end with ".lock"
16909 git-svn: don't output git commits in quiet mode
16910 git-svn: add a double quiet option to hide git commits
16913 git-send-email.txt: describe --compose better
16914 pretty.c: add %f format specifier to format_commit_message()
16915 format-patch: construct patch filename in one function
16916 format-patch: pass a commit to reopen_stdout()
16917 format-patch: move get_patch_filename() into log-tree
16918 format-patch: --attach/inline uses filename instead of SHA1
16919 format-patch: --numbered-files and --stdout aren't mutually exclusive
16920 completion: add --annotate option to send-email
16921 completion: add --cc and --no-attachment option to format-patch
16922 completion: add --thread=deep/shallow to format-patch
16923 format_sanitized_subject: Don't trim past initial length of strbuf
16925 Sverre Rabbelier (1):
16926 Teach rebase to rebase even if upstream is up to date
16929 http.c: use strbuf API in quote_ref_url
16932 completion: For consistency, change "git rev-parse" to __gitdir calls
16933 completion: Use consistent if [...] convention, not "test"
16934 completion: Better __git_ps1 support when not in working directory
16935 completion: More fixes to prevent unbound variable errors
16938 bash completion: add --format= and --oneline options for "git log"
16941 format-patch: threading test reactivation
16942 Support coverage testing with GCC/gcov
16943 Test that diff can read from stdin
16944 Test diff --dirstat functionality
16946 Test fsck a bit harder
16947 Test log --decorate
16948 Test rev-list --parents/--children
16950 format-patch: track several references
16951 format-patch: thread as reply to cover letter even with in-reply-to
16952 format-patch: support deep threading
16953 Documentation: filter-branch: show --ignore-unmatch in main index-filter example
16955 Todd Zullinger (1):
16956 bash completion: Update 'git am' options
16958 Tor Arne Vestbø (2):
16959 git-rebase: Add --stat and --no-stat for producing diffstat on rebase
16960 git-pull: Allow --stat and --no-stat to be used with --rebase
16962 Wesley J. Landaker (1):
16963 Documentation: git-svn: fix trunk/fetch svn-remote key typo
16965 Wincent Colaiuta (2):
16966 Grammar fixes to "merge" and "patch-id" docs
16967 Grammar fix for "git merge" man page
16970 Version v1.6.2.5; changes since v1.6.2.4:
16971 -----------------------------------------
16974 builtin-merge: fix a typo in an error message
16975 Documentation: fix a grammatical error in api-builtin.txt
16977 Frank Lichtenheld (1):
16978 gitcvs-migration: Link to git-cvsimport documentation
16980 Johannes Schindelin (1):
16981 Fix off-by-one in read_tree_recursive
16983 Junio C Hamano (7):
16984 read-tree A B: do not corrupt cache-tree
16985 Move prime_cache_tree() to cache-tree.c
16986 read-tree -m A B: prime cache-tree from the switched-to tree
16987 checkout branch: prime cache-tree fully
16988 diff -c -p: do not die on submodules
16992 Linus Torvalds (3):
16993 process_{tree,blob}: show objects without buffering
16994 show_object(): push path_name() call further down
16995 grep: fix segfault when "git grep '('" is given
16997 Michał Kiedrowicz (3):
16998 tests: test applying criss-cross rename patch
16999 builtin-apply: keep information about files to be deleted
17000 tests: make test-apply-criss-cross-rename more robust
17003 honor repack.usedeltabaseoffset when fetching packs
17006 test-genrandom: Add newline to usage string
17008 Wincent Colaiuta (1):
17009 git add -p: add missing "q" to patch prompt
17012 Version v1.6.2.4; changes since v1.6.2.3:
17013 -----------------------------------------
17015 Björn Steinbrink (1):
17016 tree_entry_interesting: a pathspec only matches at directory boundary
17018 Clemens Buchacher (3):
17019 add tests for merging with submodules
17020 update cache for conflicting submodule entries
17021 simplify output of conflicting merge
17023 Erik Faye-Lund (4):
17024 test-suite: adding a test for fast-export with tag variants
17025 builtin-fast-export.c: turn error into warning
17026 builtin-fast-export.c: fix crash on tagged trees
17027 builtin-fast-export.c: handle nested tags
17029 Frank Lichtenheld (1):
17030 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
17033 doc/gitattributes: clarify location of config text
17034 add-interactive: refactor mode hunk handling
17037 Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
17039 Johannes Schindelin (1):
17040 Fix 'git checkout <submodule>' to update the index
17043 t1301-shared-repo: fix forced modes test
17045 Junio C Hamano (4):
17046 match_tree_entry(): a pathspec only matches at directory boundaries
17047 Describe fixes since 1.6.2.3
17048 Speed up reflog pruning of unreachable commits
17051 Linus Torvalds (1):
17052 Clean up reflog unreachability pruning decision
17054 Markus Heidelberg (2):
17055 doc/git-daemon: add missing arguments to options
17056 doc/git-daemon: add missing arguments to max-connections option
17059 git add -p: new "quit" command at the prompt.
17060 Update git-add.txt according to the new possibilities of 'git add -p'.
17062 Nguyễn Thái Ngọc Duy (1):
17063 Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
17066 imap-send: use correct configuration variable in documentation
17068 Thomas Jarosch (1):
17069 Fix buffer overflow in config parser
17072 git-apply: fix option description
17075 Version v1.6.2.3; changes since v1.6.2.2:
17076 -----------------------------------------
17078 Björn Steinbrink (1):
17079 process_{tree,blob}: Remove useless xstrdup calls
17082 t7700-repack: add two new tests demonstrating repacking flaws
17083 git-repack.sh: don't use --kept-pack-only option to pack-objects
17084 pack-objects: only repack or loosen objects residing in "local" packs
17085 Remove --kept-pack-only option and associated infrastructure
17086 t7700: demonstrate repack flaw which may loosen objects unnecessarily
17087 pack-objects: don't loosen objects available in alternate or kept packs
17090 git-repack: use non-dashed update-server-info
17092 Daniel Cheng (aka SDiZ) (1):
17093 State the effect of filter-branch on graft explicitly
17096 Change double quotes to single quotes in message
17099 Documentation: clarify .gitattributes search
17102 t1301: loosen test for forced modes
17103 commit: abort commit if interactive add failed
17106 Move chmod(foo, 0444) into move_temp_to_file()
17109 git submodule: fix usage line
17111 Junio C Hamano (12):
17112 git-repack: resist stray environment variable
17113 has_sha1_pack(): refactor "pretend these packs do not exist" interface
17114 has_sha1_kept_pack(): take "struct rev_info"
17115 Consolidate ignore_packed logic more
17116 Simplify is_kept_pack()
17117 is_kept_pack(): final clean-up
17118 diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
17119 "core.sharedrepository = 0mode" should set, not loosen
17120 move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath
17121 set_shared_perm(): sometimes we know what the final mode bits should look like
17122 Start 1.6.2.3 preparation
17125 Linus Torvalds (1):
17126 process_{tree,blob}: Remove useless xstrdup calls
17128 Markus Heidelberg (1):
17129 doc/git-pack-refs: fix two grammar issues
17132 git-checkout.txt: fix incorrect statement about HEAD and index
17133 git-checkout.txt: clarify that <branch> applies when no path is given.
17134 git-pull.sh: better warning message for "git pull" on detached head.
17137 Version v1.6.2.2; changes since v1.6.2.1:
17138 -----------------------------------------
17141 Documentation: update graph api example.
17144 git-branch: display "was sha1" on branch deletion rather than just "sha1"
17146 Carlo Marcelo Arenas Belon (1):
17147 documentation: update cvsimport description of "-r" for recent clone
17149 Daniel Barkalow (1):
17150 Give error when no remote is configured
17152 Daniel Cheng (aka SDiZ) (1):
17153 Fix bash completion in path with spaces
17156 everyday: use the dashless form of git-init
17158 David J. Mellor (12):
17159 Documentation: minor grammatical fixes in git-archive.txt.
17160 Documentation: reword the "Description" section of git-bisect.txt.
17161 Documentation: minor grammatical fixes in git-blame.txt.
17162 Documentation: minor grammatical fixes in git-branch.txt.
17163 Documentation: reworded the "Description" section of git-bisect.txt.
17164 Documentation: reword example text in git-bisect.txt.
17165 Documentation: remove some uses of the passive voice in git-bisect.txt
17166 Documentation: minor grammatical fixes and rewording in git-bundle.txt
17167 Documentation: minor grammatical fixes in git-cat-file.txt
17168 Documentation: minor grammatical fixes in git-check-attr.txt
17169 Documentation: minor grammatical fix in git-check-ref-format.txt
17170 Documentation: Remove spurious uses of "you" in git-bisect.txt.
17173 test-lib: Clean up comments and Makefile.
17176 git-svn: fix ls-tree usage with dash-prefixed paths
17179 Documentation: Remove an odd "instead"
17182 doc: clarify how -S works
17183 ls-files: require worktree when --deleted is given
17184 fix portability problem with IS_RUN_COMMAND_ERR
17186 Johannes Schindelin (4):
17187 rsync transport: allow local paths, and fix tests
17188 Smudge the files fed to external diff and textconv
17189 import-zips: fix thinko
17190 mailmap: resurrect lower-casing of email addresses
17193 Propagate --exec-path setting to external commands via GIT_EXEC_PATH
17194 diff --no-index: Do not generate patch output if other output is requested
17196 Junio C Hamano (6):
17197 read-tree A B C: do not create a bogus index and do not segfault
17198 Remove total confusion from git-fetch and git-push
17199 blame: read custom grafts given by -S before calling setup_revisions()
17200 Update draft release notes to 1.6.2.2
17201 Update draft release notes to 1.6.2.2
17204 Linus Torvalds (1):
17205 close_sha1_file(): make it easier to diagnose errors
17207 Michael J Gruber (2):
17208 git submodule: Add test cases for git submodule add
17209 git submodule: Fix adding of submodules at paths with ./, .. and //
17211 Nico -telmich- Schottelius (1):
17212 git-tag(1): add hint about commit messages
17215 avoid possible overflow in delta size filtering computation
17218 diffcore-pickaxe: use memmem()
17219 optimize compat/ memmem()
17220 pickaxe: count regex matches only once
17222 Shawn O. Pearce (1):
17223 Increase the size of the die/warning buffer to avoid truncation
17226 format-patch: --numbered-files and --stdout aren't mutually exclusive
17229 send-email: respect in-reply-to regardless of threading
17230 send-email: test --no-thread --in-reply-to combination
17231 Documentation: format-patch --root clarifications
17232 bash completion: only show 'log --merge' if merging
17235 Version v1.6.2.1; changes since v1.6.2:
17236 ---------------------------------------
17239 builtin-revert.c: release index lock when cherry-picking an empty commit
17241 Christian Couder (1):
17242 Documentation: fix badly indented paragraphs in "--bisect-all" description
17245 Ensure proper setup of git_dir for git-hash-object
17247 Finn Arne Gangstad (1):
17248 Support "\" in non-wildcard exclusion entries
17251 send-email: allow send-email to run outside a repo
17252 send-email: handle multiple Cc addresses when reading mbox message
17253 send-email: --suppress-cc improvements
17254 send-email: don't create temporary compose file until it is needed
17257 never fallback relative times to absolute
17258 t1300: use test_must_fail as appropriate
17259 document config --bool-or-int
17262 Make the 'lock file' exists error more informative
17264 Junio C Hamano (4):
17265 git-add -i/-p: learn to unwrap C-quoted paths
17266 Beginning of 1.6.2 maintenance track
17267 Update draft release notes for 1.6.2.1
17271 cleanup: add isascii()
17274 Version v1.6.2; changes since v1.6.2-rc2:
17275 -----------------------------------------
17278 git-svn - return original format_svn_date semantics
17280 Christian Couder (2):
17281 bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
17282 bisect: fix another instance of eval'ed string
17285 added missing backtick in git-apply.txt
17287 David J. Mellor (4):
17288 Documentation: minor grammatical fixes.
17289 Documentation: minor grammatical fixes.
17290 Documentation: minor grammatical fixes.
17291 Documentation: minor grammatical fixes.
17294 git-svn: disable broken symlink workaround by default
17297 t5540-http-push.sh: avoid non-portable grep -P
17300 t3400-rebase: Move detached HEAD check earlier
17302 Junio C Hamano (2):
17303 git-am: make --abort less dangerous
17306 Michael J Gruber (1):
17307 git-am: Keep index in case of abort with dirty index
17310 Fix odb_mkstemp() on AIX
17311 Documentation: Typos / spelling fixes in RelNotes
17312 Documentation: Expand a couple of abbreviations
17313 Documentation: Typo / spelling / formatting fixes
17315 Paul Mackerras (1):
17316 gitk: Fix possible infinite loop and display corruption
17319 Documentation/git-archive.txt: Note attributes
17321 Todd Zullinger (1):
17322 git-rebase: Update --whitespace documentation
17325 Version v1.6.2-rc2; changes since v1.6.2-rc1:
17326 ---------------------------------------------
17328 Abhijit Menon-Sen (1):
17329 Convert git-* invocations to "git *" in the svnimport example.
17331 Alexandre Julliard (3):
17332 git.el: Make sure that file lists are sorted as they are created.
17333 git.el: Improve the confirmation message on remove and revert.
17334 Add a README in the contrib/emacs directory.
17337 trace: Fixed a minor typo in an error message.
17340 git-svn fix to avoid using strftime %z
17342 Brian Gernhardt (1):
17343 git-svn: Create leading directories in create-ignore
17345 Christian Couder (1):
17346 README: fix path to "gitcvs-migration.txt" and be more consistent
17349 git-svn: fix delete+add branch tracking with empty files
17351 Felipe Contreras (2):
17352 git add: trivial codestyle cleanup
17353 sha1_file.c: fix typo
17356 Documentation/git-push: --all, --mirror, --tags can not be combined
17357 Install builtins with the user and group of the installing personality
17358 git-quiltimport: preserve standard input to be able to read user input
17360 Giuseppe Bilotta (1):
17361 gitweb: fix wrong base URL when non-root DirectoryIndex
17364 disallow providing multiple upstream branches to rebase, pull --rebase
17365 Allow HTTP tests to run on Darwin
17367 Johannes Schindelin (2):
17368 Introduce the function strip_path_suffix()
17369 system_path(): simplify using strip_path_suffix(), and add suffix "git"
17372 gitattributes.txt: Path matching rules are explained in gitignore.txt
17374 Junio C Hamano (4):
17375 git-svn: fix parsing of timestamp obtained from svn
17376 tests: fix "export var=val"
17377 Make sure objects/pack exists before creating a new pack
17380 Lars Noschinski (1):
17381 filter-branch -d: Export GIT_DIR earlier
17383 Linus Torvalds (1):
17384 Support 'raw' date format
17386 Marc Branchaud (1):
17387 Docs: Expand explanation of the use of + in git push refspecs.
17389 Marcel M. Cary (2):
17390 gitweb: Fix warnings with override permitted but no repo override
17391 gitweb: Hyperlink multiple git hashes on the same commit message line
17394 Document git blame --reverse.
17395 More friendly message when locking the index fails.
17397 Michael J Gruber (1):
17398 Fix typo in contrib/examples/git-svnimport.txt
17401 Skip timestamp differences for diff --no-index
17404 git-p4: avoid syncing duplicate changes
17406 Peter Oberndorfer (1):
17407 git-svn: read the dcommit url from the config file on a per remote basis
17410 bash: add missing 'git merge' options
17411 bash: update 'git svn' options
17414 bash completion: refactor common log, shortlog and gitk options
17415 bash completion: only show 'log --merge' if merging
17417 Todd Zullinger (1):
17418 Documentation: Note file formats send-email accepts
17421 Version v1.6.2-rc1; changes since v1.6.2-rc0:
17422 ---------------------------------------------
17424 Alexandre Julliard (1):
17425 Describe notable git.el changes in the release notes
17427 Anton Gyllenberg (1):
17428 test case for regression caused by git-svn empty symlink fix
17430 Christian Couder (1):
17431 rev-list: fix showing distance when using --bisect-all
17434 git-svn: Print revision while searching for earliest use of path
17437 git-svn: Fix for rewriteRoot URL containing username.
17440 fast-export: ensure we traverse commits in topological order
17443 filter-branch: Add more error-handling
17446 git-svn: allow disabling expensive broken symlink checks
17447 git-svn: fix broken symlink workaround when switching branches
17450 submodule: add --no-fetch parameter to update command
17453 Add 'rm -f' equivalent to 'git rm' example of filter-branch --index-filter
17455 Jakub Narębski (1):
17456 gitweb: Better regexp for SHA-1 committag match
17459 symbolic-ref: allow refs/<whatever> in HEAD
17462 Update documentation to add further information about using Thunderbird with git-imap-send.
17464 Johannes Schindelin (4):
17465 Let ls-files strip trailing slashes in submodules' paths
17466 submodule: warn about non-submodules
17467 Add two extra tests for git rebase
17468 gc: make --prune useful again by accepting an optional parameter
17471 Make test-path-utils more robust against incorrect use
17472 Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()
17473 Test and fix normalize_path_copy()
17474 Remove unused normalize_absolute_path()
17476 Junio C Hamano (16):
17477 Revert "Merge branch 'js/notes'"
17478 Modernize t5400 test script
17479 remote prune: warn dangling symrefs
17480 Warn use of "origin" when remotes/origin/HEAD is dangling
17481 Drop double-semicolon in C
17482 receive-pack: receive.denyDeleteCurrent
17483 builtin-receive-pack.c: do not initialize statics to 0
17484 revision traversal and pack: notice and die on missing commit
17485 Squelch overzealous "ignoring dangling symref" in an empty repository
17486 Make repack less likely to corrupt repository
17487 Prepare for 1.6.1.4.
17488 Revert "validate_headref: tighten ref-matching to just branches"
17489 Install the default "master" branch configuration after cloning a void
17490 Teach the "@{-1} syntax to "git branch"
17491 Teach @{-1} to git merge
17495 Remove redundant bit clears from diff_setup()
17498 tree.c: allow read_tree_recursive() to traverse gitlink entries
17500 Marcel M. Cary (1):
17501 git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree
17503 Marius Storm-Olsen (5):
17504 Add mailmap.file as configurational option for mailmap location
17505 Add find_insert_index, insert_at_index and clear_func functions to string_list
17506 Add map_user() and clear_mailmap() to mailmap
17507 Change current mailmap usage to do matching on both name and email of author/committer.
17508 Move mailmap documentation into separate file
17511 git-rebase.txt: --interactive does not work with --whitespace
17514 bash-completion: Complete the values of color.interactive, color.ui, color.pager
17516 Matt McCutchen (1):
17517 gitweb: add $prevent_xss option to prevent XSS by repository content
17519 Michael J Gruber (1):
17520 Fix the installation path for html documentation
17523 Bugfix: GIT_EXTERNAL_DIFF with more than one changed files
17526 Fix contrib/hooks/post-receive-email for new duplicate branch
17529 Fix GIT_CEILING_DIRECTORIES on Windows
17530 builtin-receive-pack.c: fix compiler warnings about format string
17533 Move 'rev-parse --git-dir' test to t1500
17534 t1500: more 'git rev-parse --git-dir' tests
17535 bash: fix misspelled 'git svn' option
17538 git-svn: abstract out a block into new method other_gs()
17541 doc/bundle: Use the more conventional suffix '.bundle'
17543 Shawn O. Pearce (2):
17544 Clear the delta base cache during fast-import checkpoint
17545 Clear the delta base cache if a pack is rebuilt
17547 Sitaram Chamarty (1):
17548 Documentation: clarify commits affected by gitk --merge
17551 add -p: get rid of Git.pm warnings about unitialized values
17552 Makefile: resort filenames alphabetically
17553 Generalize and libify index_is_dirty() to index_differs_from(...)
17556 use a hash of the lock token as the suffix for PUT/MOVE
17559 completion: Fix GIT_PS1_SHOWDIRTYSTATE to prevent unbound variable errors.
17560 completion: Get rid of tabbed indentation in comments. Replace with spaces.
17563 log: do not print ellipses with --abbrev-commit
17564 Documentation: pruning recipe for destructive filter-branch
17566 Todd Zullinger (1):
17567 git-web--browse: Fix check for /bin/start
17570 Version v1.6.2-rc0; changes since v1.6.1.4:
17571 -------------------------------------------
17574 builtin-shortlog.c: use string_list_append(), and don't strdup unnecessarily
17575 git.c: make autocorrected aliases work
17576 t7501-commit.sh: explicitly check that -F prevents invoking the editor
17578 Alexander Potashev (4):
17579 remove trailing LF in die() messages
17580 add is_dot_or_dotdot inline function
17581 Allow cloning to an existing empty directory
17582 Replace deprecated dashed git commands in usage
17584 Alexandre Julliard (8):
17585 git.el: Add a checkout command.
17586 git.el: Add a command to create a new branch.
17587 git.el: Add commands for cherry-pick and revert.
17588 git.el: Make git-run-command-region display the error if any.
17589 git.el: Set a regexp for paragraph-separate in log-edit mode.
17590 git.el: Use integer instead of character constants in case statement.
17591 git.el: Add some notes about Emacs versions compatibility.
17592 emacs: Remove the no longer maintained vc-git package.
17594 Arjen Laarhoven (1):
17595 t/t4202-log.sh: Add testcases
17597 Benjamin Kramer (1):
17600 Boyd Stephen Smith Jr (2):
17601 color-words: Support diff.wordregex config option
17602 Change the spelling of "wordregex".
17605 t7700: demonstrate misbehavior of 'repack -a' when local packs exist
17606 Makefile: use shell for-loop rather than Make's foreach loop during install
17608 Charles Bailey (7):
17609 Fix some tab/space inconsistencies in git-mergetool.sh
17610 Add -y/--no-prompt option to mergetool
17611 mergetool: Add prompt to continue after failing to merge a file
17612 mergetool: Don't keep temporary merge files unless told to
17613 mergetool: respect autocrlf by using checkout-index
17614 mergetool: Add a test for running mergetool in a sub-directory
17615 mergetool: fix running mergetool in sub-directories
17617 Christian Couder (1):
17618 sha1_file: make "read_object" static
17620 Clemens Buchacher (2):
17621 clean up pathspec matching
17622 remove pathspec_match, use match_pathspec instead
17625 contrib: add 'git difftool' for launching common merge tools
17626 difftool: fix documentation problems
17627 difftool: put the cursor on the editable file for Vim
17628 contrib/difftool: Don't repeat merge tool candidates
17630 David M. Syzdek (1):
17631 autoconf: Enable threaded delta search when pthreads are supported
17634 git-svn: add --authors-file test
17635 git-svn: handle empty files marked as symlinks in SVN
17636 git-svn: better attempt to handle broken symlink updates
17637 git-svn: fix SVN 1.1.x compatibility
17638 git-svn: avoid importing nested git repos
17639 git-svn: fix memory leak when checking for empty symlinks
17642 cvsserver: add option to configure commit message
17643 cvsserver: change generation of CVS author names
17645 Giuseppe Bilotta (16):
17646 gitweb: add patch view
17647 gitweb: change call pattern for git_commitdiff
17648 gitweb: add patches view
17649 gitweb: link to patch(es) view in commit(diff) and (short)log view
17650 gitweb: use href() when generating URLs in OPML
17651 gitweb: don't use pathinfo for global actions
17652 gitweb: suggest name for OPML view
17653 gitweb: channel image in rss feed
17654 gitweb: feed generator metadata
17655 gitweb: rss feed managingEditor
17656 gitweb: rss channel date
17657 gitweb: last-modified time should be commiter, not author
17658 gitweb: check if-modified-since for feeds
17659 gitweb: make static files accessible with PATH_INFO
17660 gitweb: webserver config for PATH_INFO
17661 gitweb: align comments to code
17664 Make opt_parse_with_commit() non-static
17665 Make has_commit() non-static
17666 git-tag: Add --contains option
17668 Jakub Narębski (4):
17669 gitweb: Move 'lineno' id from link to row element in git_blame
17670 gitweb: A bit of code cleanup in git_blame()
17671 gitweb: cache $parent_commit info in git_blame()
17672 gitweb: Update README that gitweb works better with PATH_INFO
17675 git-am: minor cleanups
17676 Makefile: minor improvements for Mac OS X (Darwin)
17679 Makefile: clean up TEST_PROGRAMS definition
17680 color: make it easier for non-config to parse color specs
17681 expand --pretty=format color options
17682 diff: refactor tempfile cleanup handling
17683 chain kill signals for cleanup functions
17684 refactor signal handling for cleanup functions
17685 pager: do wait_for_pager on signal death
17686 validate_headref: tighten ref-matching to just branches
17687 symbolic ref: refuse non-ref targets in HEAD
17688 t0005: use SIGTERM for sigchain test
17690 Johannes Gilger (1):
17691 mergetool: Don't repeat merge tool candidates
17693 Johannes Schindelin (24):
17694 Force t5302 to use a single thread
17695 Introduce commit notes
17696 Add a script to edit/inspect notes
17697 git wrapper: Make while loop more reader-friendly
17698 bundle: allow rev-list options to exclude annotated tags
17699 show <tag>: reuse pp_user_info() instead of duplicating code
17700 Implement the patience diff algorithm
17701 Introduce the diff option '--patience'
17702 bash completions: Add the --patience option
17703 Speed up git notes lookup
17704 Add an expensive test for git-notes
17705 Add color_fwrite_lines(), a function coloring each line individually
17706 color-words: refactor word splitting and use ALLOC_GROW()
17707 color-words: change algorithm to allow for 0-character word boundaries
17708 color-words: take an optional regular expression describing words
17709 Fix parsing of @{-1}@{1}
17710 rebase -i --root: fix check for number of arguments
17711 t3404 & t3411: undo copy&paste
17712 lib-rebase.sh: Document what set_fake_editor() does
17713 test-lib.sh: introduce test_commit() and test_merge() helpers
17717 Fix 'git diff --no-index' with a non-existing symlink target
17720 Windows: Fix signal numbers
17721 Windows: Fix intermittent failures of t7701
17724 Fix Documentation typos surrounding the word 'handful'.
17727 git-am: Make it easier to see which patch failed
17729 Junio C Hamano (26):
17730 Document "git-reset --merge"
17732 Resurrect "git apply --flags -" to read from the standard input
17733 git-am: add --directory=<dir> option
17734 Update 1.6.2 draft release notes
17735 git-am: fix shell quoting
17736 checkout: implement "@{-N}" shortcut name for N-th last branch
17737 git-am: re-fix the diag message printing
17738 interpret_nth_last_branch(): avoid traversing the reflog twice
17739 Fix reflog parsing for a malformed branch switching entry
17740 interpret_nth_last_branch(): plug small memleak
17741 Introduce for_each_recent_reflog_ent().
17742 Simplify parsing branch switching events in reflog
17743 http-push.c: style fixes
17744 am: Add --committer-date-is-author-date option
17745 rebase -i: correctly remember --root flag across --continue
17746 tests: Avoid single-shot environment export for shell function invocation
17747 Update draft release notes to 1.6.2
17748 fsck: HEAD is part of refs
17749 fsck: check loose objects from alternate object stores by default
17750 http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI
17751 receive-pack: explain what to do when push updates the current branch
17752 t3412: further simplify setting of GIT_EDITOR
17753 tests: fix test_commit() for case insensitive filesystems
17754 Makefile: fix misdetection of relative pathnames
17758 test more combinations of ignore-whitespace options to diff
17760 Kirill Smelkov (1):
17761 mailinfo: cleanup extra spaces for complex 'From:'
17764 Cleanup of unused symcache variable inside diff-lib.c
17765 lstat_cache(): more cache effective symlink/directory detection
17766 lstat_cache(): introduce has_symlink_or_noent_leading_path() function
17767 lstat_cache(): introduce has_dirs_only_path() function
17768 lstat_cache(): introduce invalidate_lstat_cache() function
17769 lstat_cache(): introduce clear_lstat_cache() function
17772 bash completion: Add '--intent-to-add' long option for 'git add'
17773 bash completion: Use 'git add' completions for 'git stage'
17775 Linus Torvalds (1):
17776 Add 'merge' mode to 'git reset'
17778 Marcel Koeppen (1):
17779 git-svn: Show UUID in svn info for added directories with svn 1.5.5
17781 Markus Heidelberg (10):
17782 git-cherry: make <upstream> parameter optional
17783 Documentation: clarify which parameters are optional to git-cherry
17784 contrib/vim: change URL to point to the latest syntax files
17785 Documentation: let asciidoc align related options
17786 mergetool: put the cursor on the editable file for Vim
17787 contrib/difftool: change trap condition from SIGINT to INT
17788 contrib/difftool: remove distracting 'echo' in the SIGINT handler
17789 use uppercase POSIX compliant signals for the 'trap' command
17790 bash completion: add 'rename' subcommand to git-remote
17791 contrib/difftool: add support for Kompare
17794 gitweb: unify boolean feature subroutines
17796 Michele Ballabio (1):
17797 git-shortlog.txt: fix example about .mailmap
17800 Add support for a pdf version of the user manual
17801 parse-opt: migrate builtin-apply.
17802 gittutorial: remove misleading note
17804 Nanako Shiraishi (3):
17805 git-am: Add --ignore-date option
17806 Mention "local convention" rule in the CodingGuidelines
17807 git-bundle doc: update examples
17810 autodetect number of CPUs by default when using threads
17811 pack-objects: don't use too many threads with few objects
17814 config.mak.in: define paths without trailing slash
17817 git-svn: Add --localtime option to "fetch"
17819 Pierre Habouzit (1):
17820 filter-branch: add git_commit_non_empty_tree and --prune-empty.
17822 Ralf Wildenhues (1):
17823 Fix naming scheme for configure cache variables.
17826 diff: add option to show context between close hunks
17827 strbuf: instate cleanup rule in case of non-memory errors
17828 grep -w: forward to next possible position after rejected match
17829 grep: don't call regexec() for fixed strings
17832 Change NUL char handling of isspecial()
17833 Add is_regex_special()
17834 Optimize color_parse_mem
17837 bash: add '--merge' to 'git reset'
17838 bash: remove unnecessary checks for long options with argument
17839 bash: add missing format-patch command line options
17840 bash: refactor 'git log --pretty=<format>' options
17843 commit: more compact summary and without extra quotes
17844 tutorial-2: Update with the new "git commit" ouput
17846 Serge van den Boom (1):
17847 Makefile: Make 'configure --with-expat=path' actually work
17849 Stefan Karpinski (2):
17850 git-cvsserver: handle CVS 'noop' command.
17851 git-cvsserver: run post-update hook *after* update.
17853 Steffen Prohaska (6):
17854 Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX)
17855 git_extract_argv0_path(): Move check for valid argv0 from caller to callee
17856 Add calls to git_extract_argv0_path() in programs that call git_config_*
17857 Modify setup_path() to only add git_exec_path() to PATH
17858 Compute prefix at runtime if RUNTIME_PREFIX is set
17859 Windows: Revert to default paths and convert them by RUNTIME_PREFIX
17862 checkout: don't crash on file checkout before running post-checkout hook
17863 Move run_hook() from builtin-commit.c into run-command.c (libgit)
17864 api-run-command.txt: talk about run_hook()
17865 run_hook(): check the executability of the hook before filling argv
17866 run_hook(): allow more than 9 hook arguments
17869 Refactor git_set_argv0_path() to git_extract_argv0_path()
17871 Sverre Rabbelier (1):
17872 Allow cloning an empty repository
17875 http-push: refactor lock-related headers creation for curl requests
17876 http-push: refactor request url creation
17877 http-push: add back underscore separator before lock token
17878 http-push: wrap signature of get_remote_object_url
17881 bash-completion: Support running when set -u is enabled
17882 bash-completion: Try bash completions before simple filetype
17883 bash-completion: Add comments to remind about required arguments
17884 make: Remove -pthread on Darwin (it is included by cstdlib).
17887 Fix the building of user-manual.texi and gitman.texi documents
17888 Fix the building of gitman.info document
17889 diff-options.txt: Fix asciidoc markup issue
17892 rebase -i: execute hook only after argument checking
17893 rebase: learn to rebase root commit
17894 rebase -i: learn to rebase root commit
17895 rebase: update documentation for --root
17896 notes: fix core.notesRef documentation
17897 color-words: enable REG_NEWLINE to help user
17898 color-words: expand docs with precise semantics
17899 color-words: make regex configurable via attributes
17900 sha1_name: tweak @{-N} lookup
17901 sha1_name: support @{-N} syntax in get_sha1()
17902 checkout: implement "-" abbreviation, add docs and tests
17903 bash completion: move pickaxe options to log
17904 bash completion: refactor diff options
17905 t1505: remove debugging cruft
17906 t3412: clean up GIT_EDITOR usage
17907 t3412: use log|name-rev instead of log --graph
17908 bash: offer to show (un)staged changes
17909 add -p: change prompt separator for 'g'
17910 add -p: trap Ctrl-D in 'goto' mode
17911 contrib git-resurrect: find traces of a branch name and resurrect it
17912 add -p: prompt for single characters
17913 add -p: print errors in separate color
17914 add -p: import Term::ReadKey with 'require'
17916 Tor Arne Vestbø (1):
17917 git-notes: fix printing of multi-line notes
17919 Vitaly "_Vi" Shukela (3):
17920 git-svn: add --ignore-paths option for fetching
17921 git-svn: documented --ignore-paths
17922 git-svn: Add test for --ignore-paths parameter
17924 William Pursell (5):
17925 Add subroutine to display one-line summary of hunks
17926 Add 'g' command to go to a hunk
17927 git-add -i/-p: Change prompt separater from slash to comma
17928 Add / command in add --patch
17929 In add --patch, Handle K,k,J,j slightly more gracefully.
17931 jidanni@jidanni.org (1):
17932 git-show-branch doc: show -g as synonym to --reflog in the list
17934 martin f. krafft (1):
17935 git-am: implement --reject option passed to git-apply
17938 Version v1.6.1.4; changes since v1.6.1.3:
17939 -----------------------------------------
17942 Documentation: update graph api example.
17943 builtin-merge: fix a typo in an error message
17944 Documentation: fix a grammatical error in api-builtin.txt
17946 Björn Steinbrink (2):
17947 tree_entry_interesting: a pathspec only matches at directory boundary
17948 process_{tree,blob}: Remove useless xstrdup calls
17951 t7700-repack: add two new tests demonstrating repacking flaws
17952 git-repack.sh: don't use --kept-pack-only option to pack-objects
17953 pack-objects: only repack or loosen objects residing in "local" packs
17954 Remove --kept-pack-only option and associated infrastructure
17955 git-branch: display "was sha1" on branch deletion rather than just "sha1"
17956 t7700: demonstrate repack flaw which may loosen objects unnecessarily
17957 pack-objects: don't loosen objects available in alternate or kept packs
17960 builtin-revert.c: release index lock when cherry-picking an empty commit
17962 Christian Couder (3):
17963 rev-list: fix showing distance when using --bisect-all
17964 bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
17965 bisect: fix another instance of eval'ed string
17968 git-repack: use non-dashed update-server-info
17970 Daniel Cheng (aka SDiZ) (2):
17971 Fix bash completion in path with spaces
17972 State the effect of filter-branch on graft explicitly
17975 added missing backtick in git-apply.txt
17978 everyday: use the dashless form of git-init
17980 David J. Mellor (1):
17981 Documentation: minor grammatical fixes.
17984 fast-export: ensure we traverse commits in topological order
17985 Ensure proper setup of git_dir for git-hash-object
17988 test-lib: Clean up comments and Makefile.
17991 filter-branch: Fix fatal error on bare repositories
17993 Finn Arne Gangstad (1):
17994 Support "\" in non-wildcard exclusion entries
17996 Frank Lichtenheld (1):
17997 init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
17999 Geoffrey Thomas (2):
18000 utf8: add utf8_strwidth()
18001 builtin-blame.c: Use utf8_strwidth for author's names
18004 Documentation/git-push: --all, --mirror, --tags can not be combined
18007 Documentation: Remove an odd "instead"
18010 Documentation: clarify .gitattributes search
18013 builtin-remote: make rm() use properly named variable to hold return value
18014 builtin-remote: make rm operation safer in mirrored repository
18017 git: s/run_command/run_builtin/
18018 run_command(): handle missing command errors more gracefully
18019 run_command(): help callers distinguish errors
18020 git: use run_command() to execute dashed externals
18021 commit: abort commit if interactive add failed
18023 Johannes Schindelin (3):
18024 Fix submodule squashing into unrelated commit
18025 filter-branch: do not consider diverging submodules a 'dirty worktree'
18026 import-zips: fix thinko
18029 Make test-path-utils more robust against incorrect use
18030 Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()
18031 Test and fix normalize_path_copy()
18032 Remove unused normalize_absolute_path()
18033 Propagate --exec-path setting to external commands via GIT_EXEC_PATH
18034 diff --no-index: Do not generate patch output if other output is requested
18036 Junio C Hamano (19):
18037 revision traversal: allow UNINTERESTING objects to be missing
18038 rebase -i squashes submodule changes into unrelated commit
18039 add -u: do not fail to resolve a path as deleted
18040 revision traversal and pack: notice and die on missing commit
18041 Make repack less likely to corrupt repository
18042 Prepare for 1.6.1.4.
18043 tests: fix "export var=val"
18044 Make sure objects/pack exists before creating a new pack
18045 git-repack: resist stray environment variable
18046 has_sha1_pack(): refactor "pretend these packs do not exist" interface
18047 has_sha1_kept_pack(): take "struct rev_info"
18048 Consolidate ignore_packed logic more
18049 Simplify is_kept_pack()
18050 is_kept_pack(): final clean-up
18051 blame: read custom grafts given by -S before calling setup_revisions()
18052 diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
18053 match_tree_entry(): a pathspec only matches at directory boundaries
18054 diff -c -p: do not die on submodules
18057 Kirill Smelkov (4):
18058 mailinfo: correctly handle multiline 'Subject:' header
18059 mailinfo: 'From:' header should be unfold as well
18060 mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'
18061 mailinfo: tests for RFC2047 examples
18063 Linus Torvalds (3):
18064 close_sha1_file(): make it easier to diagnose errors
18065 process_{tree,blob}: Remove useless xstrdup calls
18066 grep: fix segfault when "git grep '('" is given
18068 Markus Heidelberg (1):
18069 doc/git-daemon: add missing arguments to options
18071 Matt McCutchen (1):
18072 gitweb: add $prevent_xss option to prevent XSS by repository content
18075 Document git blame --reverse.
18076 More friendly message when locking the index fails.
18077 git-checkout.txt: fix incorrect statement about HEAD and index
18078 git-checkout.txt: clarify that <branch> applies when no path is given.
18081 Skip timestamp differences for diff --no-index
18084 Fix odb_mkstemp() on AIX
18086 Nico -telmich- Schottelius (1):
18087 git-tag(1): add hint about commit messages
18090 avoid possible overflow in delta size filtering computation
18093 Fix GIT_CEILING_DIRECTORIES on Windows
18095 Shawn O. Pearce (2):
18096 Clear the delta base cache during fast-import checkpoint
18097 Clear the delta base cache if a pack is rebuilt
18100 test-genrandom: Add newline to usage string
18102 Thomas Jarosch (1):
18103 Fix buffer overflow in config parser
18106 Documentation: format-patch --root clarifications
18107 bash completion: only show 'log --merge' if merging
18109 Todd Zullinger (1):
18110 Documentation: Note file formats send-email accepts
18113 Version v1.6.1.3; changes since v1.6.1.2:
18114 -----------------------------------------
18116 Anders Melchiorsen (2):
18117 Documentation: more git push examples
18118 Documentation: rework src/dst description in git push
18120 David J. Mellor (1):
18121 Fixed broken git help -w when installing from RPM
18124 fix typo in Documentation
18125 add test-dump-cache-tree in Makefile
18127 Johannes Schindelin (2):
18128 revision walker: include a detached HEAD in --all
18129 apply: fix access to an uninitialized mode variable, found by valgrind
18131 Junio C Hamano (6):
18132 bundle: allow the same ref to be given more than once
18133 Documentation: simplify refspec format description
18134 diff.c: output correct index lines for a split diff
18135 builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
18136 grep: pass -I (ignore binary) down to external grep
18140 test more combinations of ignore-whitespace options to diff
18141 Fix combined use of whitespace ignore options to diff
18143 Linus Torvalds (1):
18144 Wrap inflate and other zlib routines for better error reporting
18147 Missing && in t/t7001.sh.
18148 Add a testcase for "git mv -f" on untracked files.
18149 builtin-mv.c: check for unversionned files before looking at the destination.
18152 merge: fix out-of-bounds memory access
18155 Fix gitdir detection when in subdir of gitdir
18158 urls.txt: document optional port specification in git URLS
18160 William Pursell (1):
18161 User-manual: "git stash <comment>" form is long gone
18164 Version v1.6.1.2; changes since v1.6.1.1:
18165 -----------------------------------------
18167 Björn Steinbrink (1):
18168 Rename detection: Avoid repeated filespec population
18171 avoid 31-bit truncation in write_loose_object
18173 Johannes Schindelin (2):
18174 get_sha1_basic(): fix invalid memory access, found by valgrind
18175 test-path-utils: Fix off by one, found by valgrind
18177 Junio C Hamano (4):
18178 ls-tree: add --full-tree option
18179 Teach format-patch to handle output directory relative to cwd
18180 send-pack: do not send unknown object name from ".have" to pack-objects
18183 Marcel M. Cary (1):
18184 git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
18186 Markus Heidelberg (2):
18187 git-commit: color status output when color.ui is set
18188 git-status -v: color diff output when color.ui is set
18190 Nanako Shiraishi (1):
18191 Document git-ls-tree --full-tree
18193 Nguyễn Thái Ngọc Duy (2):
18194 grep: support --no-ext-grep to test builtin grep
18195 grep: grep cache entries if they are "assume unchanged"
18198 objects to be pruned immediately don't have to be loosened
18201 Version v1.6.1.1; changes since v1.6.1:
18202 ---------------------------------------
18205 git-shortlog.txt: improve documentation about .mailmap files
18206 git-send-email.txt: move --format-patch paragraph to a proper location
18208 Anders Melchiorsen (4):
18209 Documentation: git push repository can also be a remote
18210 Documentation: remove a redundant elaboration
18211 Documentation: mention branches rather than heads
18212 Documentation: avoid using undefined parameters
18214 Boyd Stephen Smith Jr (1):
18215 Fix Documentation for git-describe
18217 Christian Couder (1):
18218 builtin-fsck: fix off by one head count
18220 Clemens Buchacher (4):
18221 modify/delete conflict resolution overwrites untracked file
18222 unpack-trees: handle failure in verify_absent
18223 unpack-trees: fix path search bug in verify_absent
18224 unpack-trees: remove redundant path search in verify_absent
18226 Devin Doucette (1):
18227 gitweb: Fix export check in git_get_projects_list
18229 Felipe Contreras (1):
18230 fast-import: Cleanup mode setting.
18233 Use capitalized names where appropriate
18234 Be consistent in switch usage for tar
18237 Git.pm: call Error::Simple() properly
18240 README: tutorial.txt is now called gittutorial.txt
18242 Johannes Schindelin (7):
18243 merge-recursive: mark rename/delete conflict as unmerged
18244 bisect view: call gitk if Cygwin's SESSIONNAME variable is set
18245 git add: do not add files from a submodule
18246 http-push: fix off-by-path_len
18247 http-push: when making directories, have a trailing slash in the path name
18248 t5540: clarify that http-push does not handle packed-refs on the remote
18249 Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
18251 Junio C Hamano (8):
18252 merge-recursive: do not clobber untracked working tree garbage
18253 Prepare for v1.6.1.1 maintenance release
18254 builtin-apply: prevent non-explicit permission changes
18255 git checkout: do not allow switching to a tree-ish that is not a commit
18256 format-patch: show patch text for the root commit
18257 Update draft release notes to 1.6.1.1
18258 Update draft release notes for 1.6.1.1
18261 Kirill A. Korinskiy (1):
18262 http-push: support full URI in handle_remote_ls_ctx()
18264 Lars Noschinski (1):
18265 shell: Document that 'cvs server' is a valid command
18267 Markus Heidelberg (2):
18268 doc/git-send-email: mention sendemail.cc config variable
18269 Documentation: let asciidoc align related options
18271 Michael J Gruber (2):
18272 add test cases for "git mv -k"
18273 fix handling of multiple untracked files for git mv -k
18276 fast-export: print usage when no options specified
18277 Make t3411 executable
18280 configure clobbers LDFLAGS
18282 Philippe Bruhat (1):
18283 Git.pm: correctly handle directory name that evaluates to "false"
18285 Pierre Habouzit (1):
18286 Avoid spurious error messages on error mistakes.
18289 daemon: handle freopen() failure
18290 daemon: cleanup: replace loop with if
18291 daemon: cleanup: factor out xstrdup_tolower()
18292 merge-file: handle freopen() failure
18293 pretty: factor out skip_empty_lines()
18294 pretty: factor out format_subject()
18295 pretty: support multiline subjects with format:
18296 shortlog: handle multi-line subjects like log --pretty=oneline et. al. do
18298 Shawn O. Pearce (1):
18299 describe: Avoid unnecessary warning when using --all
18302 t3501: check that commits are actually done
18303 t3404: Add test case for aborted --continue after "edit"
18304 t3404: Add test case for auto-amending only edited commits after "edit"
18305 builtin-commit.c: do not remove COMMIT_EDITMSG
18306 githooks.txt: add missing word
18309 diff: accept -- when using --no-index
18310 diff --no-index: test for pager after option parsing
18311 diff --no-index -q: fix endless loop
18313 jidanni@jidanni.org (4):
18314 Documentation/diff-options.txt: unify options
18315 Documentation/git-tag.txt: minor typo and grammar fix
18316 Documentation/git-push.txt: minor: compress one option
18317 contrib/examples/README: give an explanation of the status of these files
18320 Version v1.6.1; changes since v1.6.1-rc4:
18321 -----------------------------------------
18323 Johannes Schindelin (1):
18324 rebase -i -p: leave a --cc patch when a merge could not be redone
18327 Show a failure of rebase -p if the merge had a conflict
18328 rebase -i -p: Fix --continue after a merge could not be redone
18330 Junio C Hamano (1):
18334 t9129: skip the last three tests if UTF-8 locale is not available
18337 Version v1.6.1-rc4; changes since v1.6.1-rc3:
18338 ---------------------------------------------
18340 Alexander Gavrilov (2):
18341 git-gui: Fix handling of relative paths in blame.
18342 git-gui: Fix commit encoding handling.
18344 Arjen Laarhoven (1):
18345 Enable threaded delta search on Mac OS X/Darwin
18347 Boyd Stephen Smith Jr (1):
18348 git-revert documentation: refer to new HOWTO on reverting faulty merges
18350 Christian Stimming (3):
18351 git-gui: Update German (completed) translation.
18352 gitk: Mark forgotten strings (header sentence parts in color chooser) for translation
18353 gitk: Update German translation
18356 git-mergetool: properly handle "git mergetool -- filename"
18358 Fredrik Skolmli (1):
18359 git-gui: Starting translation for Norwegian
18361 Giuseppe Bilotta (1):
18362 gitk: Map / to focus the search box
18364 Johannes Schindelin (3):
18365 fast-import: close pack before unlinking it
18366 git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL
18367 fast-export: deal with tag objects that do not have a tagger
18370 gitk: Use check-buttons' -text property instead of separate labels
18371 gitk: Ensure that "Reset branch" menu entry is enabled
18372 gitk: Force the focus to the main window on Windows
18374 Junio C Hamano (12):
18375 git-show: do not segfault when showing a bad tag
18376 pager: do not dup2 stderr if it is already redirected
18377 gitweb: do not run "git diff" that is Porcelain
18379 gitweb: do not run "git diff" that is Porcelain
18380 make_absolute_path(): check bounds when seeing an overlong symlink
18381 builtin-blame.c: use strbuf_readlink()
18382 combine-diff.c: use strbuf_readlink()
18383 fast-import: make tagger information optional
18384 Make sure lockfiles are unlocked when dying on SIGPIPE
18385 send-email: futureproof split_addrs() sub
18389 gitk: Allow unbalanced quotes/braces in commit headers
18391 Kirill A. Korinskiy (1):
18392 Remove the requirement opaquelocktoken uri scheme
18395 bash completion: Sort config completion variables
18396 bash completion: Sync config variables with their man pages
18398 Linus Torvalds (5):
18399 Add generic 'strbuf_readlink()' helper function
18400 Make 'ce_compare_link()' use the new 'strbuf_readlink()'
18401 Make 'index_path()' use 'strbuf_readlink()'
18402 Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'
18403 Make 'prepare_temp_file()' ignore st_size for symlinks
18405 Marcel M. Cary (1):
18406 git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir
18408 Markus Heidelberg (7):
18409 Documentation: fix description for enabling hooks
18410 doc/git-reset: add reference to git-stash
18411 Documentation: sync example output with git output
18412 Documentation: fix typos, grammar, asciidoc syntax
18413 Documentation: fix typos, grammar, asciidoc syntax
18414 Documentation/git-show-branch: work around "single quote" typesetting glitch
18415 doc/git-fsck: change the way for getting heads' SHA1s
18417 Michael J Gruber (1):
18418 test overlapping ignore patterns
18420 Michele Ballabio (1):
18421 git gui: update Italian translation
18424 git-gui: Update Hungarian translation for 0.12
18425 git-daemon documentation: use {tilde}
18426 githooks documentation: add a note about the +x mode
18427 SubmittingPatches: mention the usage of real name in Signed-off-by: lines
18429 Nanako Shiraishi (3):
18430 git-gui: Update Japanese translation for 0.12
18431 Clarify documentation of "git checkout <tree-ish> paths" syntax
18432 Add a documentat on how to revert a faulty merge
18434 Paul Mackerras (1):
18435 gitk: Fix bugs in blaming code
18437 Peter Krefting (2):
18438 git-gui: Updated Swedish translation (515t0f0u).
18439 git-gui: Fixed typos in Swedish translation.
18442 Fix type-mismatch compiler warning from diff_populate_filespec()
18443 connect.c: stricter port validation, silence compiler warning
18444 fast-import.c: stricter strtoul check, silence compiler warning
18446 Richard Hartmann (2):
18447 Make help entries alphabetical
18448 Always show which directory is not a git repository
18450 Robin Rosenberg (1):
18451 git-revert: record the parent against which a revert was made
18453 Shawn O. Pearce (2):
18454 git-gui: Update po template to include 'Mirroring %s' message
18458 git-send-email: handle email address with quoted comma
18461 Version v1.6.1-rc3; changes since v1.6.1-rc2:
18462 ---------------------------------------------
18464 Alexander Gavrilov (1):
18465 Documentation: Describe git-gui Tools menu configuration options.
18467 Alexander Potashev (2):
18468 Fix typos in documentation
18469 Fix typo in comment in builtin-add.c
18471 Alexey Borzenkov (1):
18472 Define linkgit macro in [macros] section
18475 git-branch: display sha1 on branch deletion
18478 git-svn: Make following parents atomic
18480 Jakub Narębski (1):
18481 gitweb: Fix bug in insert_file() subroutine
18484 reorder ALLOW_TEXTCONV option setting
18485 diff: allow turning on textconv explicitly for plumbing
18486 diff: fix handling of binary rewrite diffs
18487 diff: respect textconv in rewrite diffs
18488 rebase: improve error messages about dirty state
18491 git-config.txt: fix a typo
18493 Johannes Schindelin (1):
18494 Get rid of the last remnants of GIT_CONFIG_LOCAL
18496 Junio C Hamano (4):
18497 builtin-checkout.c: check error return from read_cache()
18498 read-cache.c: typofix in comment
18499 work around Python warnings from AsciiDoc
18502 Linus Torvalds (1):
18503 fsck: reduce stack footprint
18505 Markus Heidelberg (1):
18506 builtin-commit: remove unused message variable
18509 make sure packs to be replaced are closed beforehand
18511 Ralf Wildenhues (1):
18512 Improve language in git-merge.txt and related docs
18514 Tor Arvid Lund (1):
18515 git-p4: Fix regression in p4Where method.
18517 YONETANI Tomokazu (1):
18518 git-fast-import possible memory corruption problem
18521 Version v1.6.1-rc2; changes since v1.6.1-rc1:
18522 ---------------------------------------------
18525 Make some of fwrite/fclose/write/close failures visible
18526 Make chdir failures visible
18527 Report symlink failures in merge-recursive
18529 Alexander Gavrilov (2):
18530 gitk: Make line origin search update the busy status
18531 gitk: Add a menu option to start git gui
18533 Christian Couder (2):
18534 bisect: fix "git bisect skip <commit>" and add tests cases
18535 Documentation: describe how to "bisect skip" a range of commits
18537 Christian Stimming (1):
18538 gitk: Update German translation
18540 Davide Libenzi (1):
18541 xdiff: give up scanning similar lines early
18544 git-svn: Make branch use correct svn-remote
18546 Giuseppe Bilotta (2):
18547 gitweb: make gitweb_check_feature a boolean wrapper
18548 Update comment on gitweb_check/get_feature
18550 Jakub Narębski (2):
18551 gitweb: Fix handling of non-ASCII characters in inserted HTML files
18552 gitweb: Make project specific override for 'grep' feature work
18555 add stage to gitignore
18556 tag: delete TAG_EDITMSG only on successful tag
18559 t4030-diff-textconv: Make octal escape sequence more portable
18561 Junio C Hamano (17):
18562 builtin-rm.c: explain and clarify the "local change" logic
18563 git add --intent-to-add: fix removal of cached emptiness
18564 git add --intent-to-add: do not let an empty blob be committed by accident
18565 gitweb: fix 'ctags' feature check and others
18566 gitweb: rename gitweb_check_feature to gitweb_get_feature
18567 Makefile: introduce NO_PTHREADS
18568 Install git-stage in exec-path
18569 git-am --whitespace: do not lose the command line option
18570 git-am: propagate -C<n>, -p<n> options as well
18571 git-am: propagate --3way options as well
18572 Test that git-am does not lose -C/-p/--whitespace options
18573 git-am: rename apply_opt_extra file to apply-opt
18574 Update draft release notes to 1.6.1
18576 Update draft release notes for 1.6.1
18577 Revert "git-stash: use git rev-parse -q"
18578 Point "stale" 1.6.0.5 documentation from the main git documentation page
18580 Linus Torvalds (1):
18581 Add backslash to list of 'crud' characters in real name
18584 git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror.
18586 Matt McCutchen (1):
18587 "git diff <tree>{3,}": do not reverse order of arguments
18590 User's Manual: remove duplicated url at the end of Appendix B
18591 git-stash: use git rev-parse -q
18592 filter-branch: use git rev-parse -q
18593 lost-found: use git rev-parse -q
18594 pull: use git rev-parse -q
18595 rebase: use git rev-parse -q
18596 submodule: use git rev-parse -q
18597 http.c: use 'git_config_string' to get 'curl_http_proxy'
18599 Nguyễn Thái Ngọc Duy (1):
18600 Extend index to save more flags
18602 Paul Mackerras (3):
18603 gitk: Fix context menu items for generating diffs when in tree mode
18604 gitk: Highlight only when search type is "containing:".
18605 gitk: Fix bug in accessing undefined "notflag" variable
18608 Add a built-in alias for 'stage' to the 'add' command
18611 fetch-pack: Avoid memcpy() with src==dst
18613 Tor Arvid Lund (1):
18614 git-p4: Fix bug in p4Where method.
18617 Version v1.6.1-rc1; changes since v1.6.0.6:
18618 -------------------------------------------
18620 Abhijit Menon-Sen (1):
18621 Make cherry-pick use rerere for conflict resolution.
18624 Extend "checkout --track" DWIM to support more cases
18625 Remove calculation of the longest command name from where it is not used
18626 Remove useless memset of static command name lists in builtin-merge.c
18627 Make main_cmds and other_cmds local to builtin-help.c
18628 Allow git help work without PATH set
18629 list_commands: only call git_exec_path if it is needed
18630 Add help.autocorrect to enable/disable autocorrecting
18631 Cleanup remove_path
18632 Fix potentially dangerous uses of mkpath and git_path
18633 Fix handle leak in sha1_file/unpack_objects if there were damaged object data
18634 Fix t4030-diff-textconv.sh
18636 Alexander Gavrilov (58):
18637 git-gui: Support starting gitk from Gui Blame
18638 git-gui: Support passing blame to a parent commit.
18639 git-gui: Better positioning in Blame Parent Commit
18640 git-gui: Allow specifying an initial line for git gui blame.
18641 gitk: Add option to specify the default commit on command line
18642 gitk: Add menu item for calling git gui blame
18643 git-gui: Support resolving conflicts via the diff context menu.
18644 git-gui: Support calling merge tools.
18645 git-gui: Don't allow staging files with conflicts.
18646 git-gui: Support more merge tools.
18647 git-gui: Support conflict states _U & UT.
18648 git-gui: Reimplement and enhance auto-selection of diffs.
18649 git-gui: Make F5 reselect a diff, if an untracked file is selected.
18650 git-gui: Show special diffs for complex conflict cases.
18651 git-gui: Fix Blame Parent & Context for working copy lines.
18652 git-gui: Restore ability to Stage Working Copy for conflicts.
18653 gitk: Fix a bug in collapsing deeply nested trees
18654 git-gui: Add more integration options to citool.
18655 git-gui: Cleanup handling of the default encoding.
18656 git-gui: Add a menu of available encodings.
18657 git-gui: Allow forcing display encoding for diffs using a submenu.
18658 git-gui: Optimize encoding name resolution using a lookup table.
18659 git-gui: Support the encoding menu in gui blame.
18660 git-gui: Reenable staging unmerged files by clicking the icon.
18661 git-gui: Make Ctrl-T safe to use for conflicting files.
18662 git-gui: Fix the blame window shape.
18663 git-gui: Add a search command to the blame viewer.
18664 git-gui: Fix the blame viewer destroy handler.
18665 gitk: Enhance file encoding support
18666 gitk: Implement batch lookup and caching of encoding attrs
18667 gitk: Allow forcing branch creation if it already exists
18668 gitk: Fix file list context menu for merge commits
18669 builtin-blame: Reencode commit messages according to git-log rules.
18670 gitk: Allow starting gui blame for a specific line
18671 git-gui: Add a dialog that shows the OpenSSH public key.
18672 git-gui: Add a simple implementation of SSH_ASKPASS.
18673 Windows: Make OpenSSH properly detect tty detachment.
18674 gitweb: Use single implementation of export_ok check.
18675 gitweb: Add a per-repository authorization hook.
18676 gitweb: Fix mod_perl support.
18677 gitk: Add Return and Escape bindings to dialogs
18678 gitk: Make gitk dialog windows transient
18679 gitk: Make cherry-pick call git-citool on conflicts
18680 gitk: Implement a user-friendly Edit View dialog
18681 git-gui: Fix focus transition in the blame viewer.
18682 git-gui: Add the Show SSH Key item to the clone dialog.
18683 git-gui: Request blame metadata in utf-8.
18684 gitk: Add accelerators to frequently used menu commands
18685 gitk: Fix transient windows on Win32 and MacOS
18686 gitk: Fix commit encoding support
18687 Documentation: New GUI configuration and command-line options.
18688 git-gui: Implement system-wide configuration handling.
18689 git-gui: Fix the after callback execution in rescan.
18690 git-gui: Add a Tools menu for arbitrary commands.
18691 git-gui: Allow Tools request arguments from the user.
18692 git-gui: Implement automatic rescan after Tool execution.
18693 git-gui: Fix the search bar destruction handler.
18694 gitk: Avoid handling the Return key twice in Add Branch
18696 Alexandre Julliard (9):
18697 git.el: Improve error handling for commits.
18698 git.el: Remove the env parameter in git-call-process and git-call-process-string.
18699 git.el: Simplify handling of merge heads in the commit log-edit buffer.
18700 git.el: Properly handle merge commits in git-amend-commit.
18701 git.el: Fix git-amend-commit to support amending an initial commit.
18702 git.el: Never clear the status buffer, only update the files.
18703 git.el: Add an insert file command.
18704 git.el: Add possibility to mark files directly in git-update-status-files.
18705 git.el: Allow to commit even if there are no marked files.
18707 Anders Melchiorsen (2):
18708 wt-status: Split header generation into three functions
18709 wt-status: Teach how to discard changes in the working directory
18711 Andreas Ericsson (3):
18712 Teach "git diff -p" to locate PHP class methods
18713 git commit: Reformat output somewhat
18714 rebase: Support preserving merges in non-interactive mode
18716 Arjen Laarhoven (1):
18717 t6023-merge-file: Work around non-portable sed usage
18720 for-each-ref: `:short` format for `refname`
18723 remote.c: add a function for deleting a refspec array and use it (twice)
18724 dir.c: Avoid c99 array initialization
18725 t4018-diff-funcname: test syntax of builtin xfuncname patterns
18726 diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785
18727 xdiff-interface.c: strip newline (and cr) from line before pattern matching
18728 Replace xmalloc/memset(0) pairs with xcalloc
18729 t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
18730 Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
18731 t4018-diff-funcname: add objective-c xfuncname pattern to syntax test
18734 Make xdi_diff_outf interface for running xdiff_outf diffs
18735 Use strbuf for struct xdiff_emit_state's remainder
18736 Always initialize xpparam_t to 0
18737 Allow alternate "low-level" emit function from xdl_diff
18739 Brian Gernhardt (2):
18740 format-patch: autonumber by default
18741 Avoid using non-portable `echo -n` in tests.
18744 git-remote: match usage string with the manual pages
18745 git-remote: add verbose mode to git remote update
18747 Christian Couder (10):
18748 merge-base: teach "git merge-base" to drive underlying merge_bases_many()
18749 bisect: test merge base if good rev is not an ancestor of bad rev
18750 bisect: only check merge bases when needed
18751 bisect: remove "checkout_done" variable used when checking merge bases
18752 refs: improve comments about "reading" argument of "resolve_ref"
18753 bisect: fix missing "exit"
18754 Documentation: user-manual: add information about "git help" at the beginning
18755 Documentation: tutorial: add information about "git help" at the beginning
18756 git-gui: french translation update
18757 bisect: teach "skip" to accept special arguments like "A..B"
18759 Christian Stimming (5):
18760 git-gui: Mark forgotten strings for translation.
18761 git-gui: I18n fix sentence parts into full sentences for translation again.
18762 git-gui: Updated German translation.
18763 gitk: Add untranslated error messages to translation
18764 git-gui: Update German translation.
18767 git-merge documentation: more details about resolving conflicts
18770 Fix non-literal format in printf-style calls
18773 git-submodule: replace duplicated code with a module_list function
18774 git-submodule: add "sync" command
18775 tests: add a testcase for "git submodule sync"
18778 Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set
18780 David M. Syzdek (5):
18781 Build: add NO_UINTMAX_T to support ancient systems
18782 Add Makefile check for FreeBSD 4.9-SECURITY
18783 autoconf: Add link tests to each AC_CHECK_FUNC() test
18784 Make Pthread link flags configurable
18785 Add autoconf tests for pthreads
18787 David Soria Parra (1):
18788 cast pid_t's to uintmax_t to improve portability
18791 git-diff: Add --staged as a synonym for --cached.
18793 Davide Libenzi (1):
18794 xdiff: give up scanning similar lines early
18797 git-svn: testcase for partial rebuild
18798 git-svn: do a partial rebuild if rev_map is out-of-date
18799 git-svn: proper detection of bare repositories
18800 git-svn: proper detection of bare repositories
18802 Dmitry Potapov (14):
18803 teach index_fd to work with pipes
18804 correct argument checking test for git hash-object
18805 correct usage help string for git-hash-object
18806 use parse_options() in git hash-object
18807 add --path option to git hash-object
18808 add --no-filters option to git hash-object
18809 mingw: remove use of _getdrive() from lstat/fstat
18810 add have_git_dir() function
18811 mingw: move common functionality to win32.h
18812 cygwin: Use native Win32 API for stat
18813 do not segfault if make_cache_entry failed
18814 print an error message for invalid path
18815 check-attr: add an internal check_attr() function
18816 check-attr: Add --stdin option
18819 Use xmalloc() and friends to catch allocation failures
18822 git-svn: check error code of send_txstream
18823 t9124: clean up chdir usage
18824 git-svn: fix handling of even funkier branch names
18825 git-svn: don't escape tilde ('~') for http(s) URLs
18826 git-svn: respect i18n.commitencoding config
18827 git-svn: don't escape tilde ('~') for http(s) URLs
18828 git-svn: respect i18n.commitencoding config
18830 Florian Ragwitz (1):
18831 Add git-svn branch to allow branch creation in SVN repositories
18833 Florian Weimer (3):
18834 git-svn: extract base blob in generate_diff
18835 git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob
18836 git-svn: Send deltas during commits
18838 Fredrik Skolmli (1):
18839 Documentation: Spelling fix
18842 Fixed some grammatical errors in git-rebase.txt documentation.
18844 Giovanni Funchal (1):
18845 configure: auto detect dynamic library path switches
18847 Giuseppe Bilotta (12):
18848 gitweb: ref markers link to named shortlogs
18849 gitweb: shortlog now also obeys $hash_parent
18850 gitweb: refactor input parameters parse/validation
18851 gitweb: parse project/action/hash_base:filename PATH_INFO
18852 gitweb: generate project/action/hash URLs
18853 gitweb: use_pathinfo filenames start with /
18854 gitweb: parse parent..current syntax from PATH_INFO
18855 gitweb: generate parent..current URLs
18856 gitweb: make the supported snapshot formats array global
18857 gitweb: retrieve snapshot format from PATH_INFO
18858 gitweb: embed snapshot format parameter in PATH_INFO
18859 git-gui: try to provide a window icon under X
18861 Gustaf Hendeby (2):
18862 Update .gitignore to ignore git-help
18863 git-gui: Teach git gui about file type changes
18866 diff --dirstat-by-file: count changed files, not lines
18868 Jakub Narębski (1):
18869 gitweb: Better processing format string in custom links in navbar
18872 Introduce receive.denyDeletes
18875 run-command: add pre-exec callback
18876 spawn pager via run_command interface
18877 format-patch: use default diff format even with patch options
18878 tests: grep portability fixes
18879 reformat informational commit message
18880 tutorial: update output of git commit
18881 tests: shell negation portability fix
18882 t4012: use test_cmp instead of cmp
18883 diff: unify external diff and funcname parsing code
18884 diff: introduce diff.<driver>.binary
18885 diff: add filter for converting binary to text
18886 document "intent to add" option to git-add
18887 rm: loosen safety valve for empty files
18888 submodule: fix some non-portable grep invocations
18889 diff: add missing static declaration
18890 document the diff driver textconv feature
18891 refactor userdiff textconv code
18892 userdiff: require explicitly allowing textconv
18893 only textconv regular files
18894 wt-status: load diff ui config
18895 add userdiff textconv tests
18896 enable textconv for diff in verbose status/commit
18897 t5400: expect success for denying deletion
18898 t5516: refactor oddball tests
18899 receive-pack: detect push to current branch of non-bare repo
18900 define empty tree sha1 as a macro
18901 wt-status: refactor initial commit printing
18902 status: show "-v" diff even for initial commit
18905 add boolean diff.suppress-blank-empty config option
18906 SubmittingPatches: fix a typo
18907 reword --full-index description
18908 xdiff-interface.c: remove 10 duplicated lines
18911 git-daemon: set REMOTE_ADDR to client address
18912 sha1_file: avoid bogus "file exists" error message
18915 Teach "git diff -p" HTML funcname patterns
18916 Fix AsciiDoc errors in merge documentation
18917 Fix submodule sync with relative submodule URLs
18919 Johannes Schindelin (7):
18920 t9700: remove useless check
18921 tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'
18922 Enable parallel tests
18923 checkout --track: make up a sensible branch name if '-b' was omitted
18924 test-lib: do not remove trash_directory if called with --debug
18925 git wrapper: DWIM mistyped commands
18926 Document levenshtein.c
18928 Johannes Sixt (11):
18929 Revert "Windows: Use a customized struct stat that also has the st_blocks member."
18930 filter-branch: Grok special characters in tag names
18931 Windows: git-shell can be compiled again
18932 compat/mingw: Support a timeout in the poll emulation if no fds are given
18933 git-gui: Do not automatically stage file after merge tool finishes
18934 git-gui: Remove space from the end of aspell's reply before processing
18935 git-gui: Fix switch statement in lib/merge.tcl
18936 git-gui: Show a round number of bytes of large untracked text files
18937 git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization
18938 git-remote: list branches in vertical lists
18939 git-gui: Do not munge conflict marker lines in a normal diff
18942 git-p4: Support purged files and optimize memory usage
18943 git-p4: Cache git config for performance
18946 git-check-attr(1): use 'verse' for multi-line synopsis sections
18948 Jonathan del Strother (3):
18949 Revert "Convert output messages in merge-recursive to past tense."
18950 Add OS X support to the pre-auto-gc example hook
18951 Teach git diff about Objective-C syntax
18953 Joshua Williams (1):
18954 git-gui: Add support for calling out to the prepare-commit-msg hook
18956 Junio C Hamano (78):
18957 builtin-add.c: restructure the code for maintainability
18958 builtin-add.c: optimize -A option and "git add ."
18959 imap-send.c: more style fixes
18960 documentation: merge-base: explain "git merge-base" with more than 2 args
18961 merge-base-many: add trivial tests based on the documentation
18962 git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
18963 revision.c: whitespace fix
18964 revision traversal: show full history with merge simplification
18965 Topo-sort before --simplify-merges
18966 update-index: refuse to add working tree items beyond symlinks
18967 add: refuse to add working tree items beyond symlinks
18968 xdiff-interface: hide the whole "xdiff_emit_state" business from the caller
18969 revision --simplify-merges: use decoration instead of commit->util field
18970 index: future proof for "extended" index entries
18971 tests: use $TEST_DIRECTORY to refer to the t/ directory
18973 Makefile: Allow CC_LD_DYNPATH to be overriden
18974 revision --simplify-merges: do not leave commits unprocessed
18975 revision --simplify-merges: make it a no-op without pathspec
18976 compat: introduce on_disk_bytes()
18977 shell: do not play duplicated definition games to shrink the executable
18978 Build-in "git-shell"
18979 Update draft release notes for 1.6.1
18980 Fix "git-merge -s bogo" help text
18981 templates/Makefile: install is unnecessary, just use mkdir -p
18982 t7606: fix custom merge test
18983 Revert "Build-in "git-shell""
18984 daemon.c: minor style fixup
18985 checkout -f: allow ignoring unmerged paths when checking out of the index
18986 checkout --ours/--theirs: allow checking out one side of a conflicting merge
18987 xdl_fill_merge_buffer(): separate out a too deeply nested function
18988 xdiff-merge: optionally show conflicts in "diff3 -m" style
18989 xmerge.c: minimum readability fixups
18990 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
18991 rerere.c: use symbolic constants to keep track of parsing states
18992 rerere: understand "diff3 -m" style conflicts with the original
18993 merge.conflictstyle: choose between "merge" and "diff3 -m" styles
18994 git-merge-recursive: learn to honor merge.conflictstyle
18995 checkout -m: recreate merge when checking out of unmerged index
18996 diff: vary default prefix depending on what are compared
18997 git commit --author=$name: look $name up in existing commits
18998 git-add --intent-to-add (-N)
18999 checkout --conflict=<style>: recreate merge in a non-default style
19000 git-merge documentation: describe how conflict is presented
19001 Update draft release notes for 1.6.1
19002 safe_create_leading_directories(): make it about "leading" directories
19003 git-apply:--include=pathspec
19004 Update draft release notes for 1.6.1
19005 daemon.c: avoid setlinebuf()
19006 is_directory(): a generic helper function
19007 receive-pack: make it a builtin
19008 push: prepare sender to receive extended ref information from the receiver
19009 push: receiver end advertises refs from alternate repositories
19010 Fix git-diff-tree --stdin
19011 diff: use extended regexp to find hunk headers
19012 diff: fix "multiple regexp" semantics to find hunk header comment
19013 Update draft release notes to 1.6.1
19014 t5510: test "git fetch" following tags minimally
19015 Update draft release notes to 1.6.1
19016 Fix reading of cloud tags
19017 Update draft release notes for 1.6.1
19018 Fix mismerge at cdb22c4 in builtin-checkout.c
19019 rebase-i-p: minimum fix to obvious issues
19020 git-rebase--interactive.sh: comparision with == is bashism
19021 receive-pack: fix "borrowing from alternate object store" implementation
19022 compat/cygwin.c: make runtime detection of lstat/stat lessor impact
19023 Stop using compat/regex.c on platforms with working regexp library
19024 Update draft release notes to 1.6.1
19025 Update draft release notes to 1.6.1
19026 Update draft release notes to 1.6.1
19027 t5303: work around printf breakage in dash
19028 t5303: fix printf format string for portability
19029 git.html: Update the links to stale versions
19030 Update draft release notes to 1.6.1
19031 builtin-remote.c: plug a small memory leak in get_one_remote_for_updates()
19032 send-email: do not reverse the command line arguments
19033 Include git-gui--askpass in git-gui RPM package
19036 Karl Hasselström (4):
19037 Refactoring: Split up diff_tree_stdin
19038 diff-tree: Note that the commit ID is printed with --stdin
19039 Teach git diff-tree --stdin to diff trees
19040 Add test for diff-tree --stdin with two trees
19042 Kirill Smelkov (1):
19043 Teach "git diff -p" Python funcname patterns
19046 bash completion: Add 'workflows' to 'git help'
19047 workflows documentation: fix link to git-request-pull[1]
19049 Linus Torvalds (8):
19050 date/time: do not get confused by fractional seconds
19051 Add a 'source' decorator for commits
19052 revision: make tree comparison functions take commits rather than trees
19053 Make '--decorate' set an explicit 'show_decorations' flag
19054 revision traversal: '--simplify-by-decoration'
19055 Add cache preload facility
19056 Fix machine-parseability of 'git log --source'
19057 Fix index preloading for racy dirty case
19059 Marcel Koeppen (1):
19060 t9129-git-svn-i18n-commitencoding: Make compare_svn_head_with() compatible with OSX sed
19063 count-objects: Add total pack size to verbose output
19064 Update t/.gitignore to ignore all trash directories
19066 Marek Zawirski (1):
19067 Make push more verbose about illegal combination of options
19070 Documentation: rev-list-options.txt: added --branches, --tags & --remotes.
19071 git-commit.txt - mention that files listed on the command line must be known to git.
19074 git-submodule - Add 'foreach' subcommand
19075 git-submodule.sh - Remove trailing / from URL if found
19076 git-submodule.sh - Remove trailing / from URL if found
19077 git-submodule - Use "get_default_remote" from git-parse-remote
19078 compat/cygwin.c - Use cygwin's stat if core.filemode == true
19080 Markus Heidelberg (1):
19081 Makefile: add install-man rules (quick and normal)
19083 Marten Svanfeldt (dev) (2):
19084 Git.pm: Make _temp_cache use the repository directory
19085 git-svn: Update git-svn to use the ability to place temporary files within repository directory
19087 Matt McCutchen (2):
19088 "git diff <tree>{3,}": do not reverse order of arguments
19089 git-merge-recursive: honor merge.conflictstyle once again
19091 Matthias Kestenholz (1):
19092 bash-completion: Add all submodule subcommands to the completion list
19094 Michael J Gruber (3):
19095 allow installation of man and html doc from the man and html branches
19096 separate build targets for man and html documentation
19097 make prune report removed objects on -v
19099 Michael Witten (9):
19100 Docs: send-email's usage text and man page mention same options
19101 Docs: send-email usage text much sexier
19102 Docs: send-email: Man page option ordering
19103 send-email: change --no-validate to boolean --[no-]validate
19104 Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
19105 Docs: send-email: Remove unnecessary config variable description
19106 Docs: send-email: Create logical groupings for --help text
19107 Docs: send-email: Create logical groupings for man text
19108 send-email: signedoffcc -> signedoffbycc, but handle both
19110 Michele Ballabio (1):
19111 git gui: update Italian translation
19113 Mikael Magnusson (1):
19114 Correct output of git-count-objects.
19117 gitweb: Sort the list of forks on the summary page by age
19120 builtin-help: make some internal functions available to other builtins
19121 builtin-merge: allow using a custom strategy
19122 Add a new test for using a custom merge strategy
19123 Add a second testcase for handling invalid strategies in git-merge
19124 builtin-help: always load_command_list() in cmd_help()
19126 Split out merge_recursive() to merge-recursive.c
19127 merge-recursive: introduce merge_options
19128 builtin-merge: avoid run_command_v_opt() for recursive and subtree
19129 cherry-pick/revert: make direct internal call to merge_tree()
19130 merge-recursive: move call_depth to struct merge_options
19131 merge-recursive: get rid of the index_only global variable
19132 merge-recursive: move the global obuf to struct merge_options
19133 merge-recursive: move current_{file,directory}_set to struct merge_options
19134 merge-recursive: get rid of virtual_id
19135 builtin-merge: release the lockfile in try_merge_strategy()
19136 commit_tree(): add a new author parameter
19137 builtin-commit: use commit_tree()
19138 t7603: add new testcases to ensure builtin-commit uses reduce_heads()
19139 builtin-merge: refresh the index before calling a strategy
19140 builtin-commit: use reduce_heads() only when appropriate
19141 Cleanup in sha1_file.c::cache_or_unpack_entry()
19142 Implement git clone -v
19143 Add Linux PPC support to the pre-auto-gc example hook
19144 parse-opt: migrate builtin-checkout-index.
19145 Implement git remote rename
19146 remote: add a new 'origin' variable to the struct
19147 git-remote rename: migrate from remotes/ and branches/
19148 git-remote: document the migration feature of the rename subcommand
19149 Update Hungarian translation. 100% completed.
19150 builtin-branch: use strbuf in delete_branches()
19151 builtin-branch: use strbuf in fill_tracking_info()
19152 builtin-branch: use strbuf in rename_branch()
19153 builtin-clone: use strbuf in guess_dir_name()
19154 builtin-clone: use strbuf in clone_local() and copy_or_link_directory()
19155 builtin_clone: use strbuf in cmd_clone()
19157 Nanako Shiraishi (22):
19158 t/t91XX-svn: start removing use of "git-" from these tests
19159 t/t91XX git-svn tests: run "git svn" not "git-svn"
19160 t9200: use "git cvsexportcommit" without dash
19161 t9300, t9301: use "git fast-import/fast-export" without dash
19162 t9700: use "git config" without dash
19163 tests: use "git foo" without dash in strings
19164 t9101: use "git hash-object" without dash
19165 Install git-cvsserver in $(bindir)
19166 remote.c: make free_ref(), parse_push_refspec() and free_refspecs() static.
19167 graph.c: make many functions static
19168 usage.c: remove unused functions
19169 Add contrib/rerere-train script
19170 dir.c: make dir_add_name() and dir_add_ignored() static
19171 run-command.c: remove run_command_v_opt_cd()
19172 config.c: make git_parse_long() static
19173 commit.c: make read_graft_file() static
19174 archive.c: make archiver static
19176 rebase: Document --no-verify option to bypass pre-rebase hook
19177 Document "git log --source"
19178 Document "git log --simplify-by-decoration"
19179 git-gui: update Japanese translation
19182 config.mak.in: Pass on LDFLAGS from configure
19184 Nicolas Pitre (18):
19185 sha1write: don't copy full sized buffers
19186 pack-objects: don't include missing preferred base objects
19187 t5300: improve SHA1 collision test
19188 fix openssl headers conflicting with custom SHA1 implementations
19189 index-pack: rationalize delta resolution code
19190 index-pack: smarter memory usage during delta resolution
19191 fix multiple issues in index-pack
19192 improve index-pack tests
19193 index-pack: don't leak leaf delta result
19194 close another possibility for propagating pack corruption
19195 better validation on delta base object offsets
19196 make unpack_object_header() non fatal
19197 make packed_object_info() resilient to pack corruptions
19198 make check_object() resilient to pack corruptions
19199 make find_pack_revindex() aware of the nasty world
19200 pack-objects: allow "fixing" a corrupted pack without a full repack
19201 extend test coverage for latest pack corruption resilience improvements
19202 pack-objects: don't leak pack window reference when splitting packs
19205 provide more errors for the "merge into empty head" case
19207 Paul Mackerras (17):
19208 gitk: Use <Button-2> for context menus on OSX
19209 gitk: Clean up file encoding code and add enable/disable option
19210 gitk: Fix binding for <Return> in sha1 entry field
19211 gitk: New way of constructing menus that allows for Alt+letter accelerators
19212 gitk: Regenerate .po files
19213 gitk: Turn short SHA1 names into links too
19214 gitk: Fix some off-by-one errors in computing which line to blame
19215 gitk: Add a menu item to show where a given line comes from
19216 gitk: Make the background color of marked lines configurable
19217 gitk: Unify handling of merge diffs with normal 2-way diffs
19218 gitk: Make "show origin of this line" work on fake commits
19219 gitk: Cope with unmerged files in local changes
19220 gitk: Improve cherry-pick error handling
19221 gitk: Fix linehtag undefined error with file highlighting
19222 gitk: Index line[hnd]tag arrays by id rather than row number
19223 gitk: Fix switch statement in parseviewargs
19224 gitk: Show local changes properly when we have a path limit
19227 git-svn: set auto_props when renaming files
19230 contrib/hooks/post-receive-email: Put rev display in separate function
19231 contrib/hooks/post-receive-email: Make revision display configurable
19233 Peter Krefting (1):
19234 Updated Swedish translation (514t0f0u).
19236 Peter Valdemar Mørch (2):
19237 Teach git log --check to return an appropriate exit code
19238 Teach git log --exit-code to return an appropriate exit code
19241 git-web--browse: Support for using /bin/start on MinGW
19242 git-gui: Clarify the Remote -> Delete... action
19243 git-gui: Squash populate_{push,fetch}_menu to populate_remotes_menu
19244 git-gui: Add support for adding remotes
19245 git-gui: Add support for removing remotes
19246 git-gui: mkdir -p when initializing new remote repository
19247 git-gui: Use git web--browser for web browsing
19248 git-gui: Add Explore Working Copy to the Repository menu
19249 git-gui: gui.autoexplore makes explorer to pop up automatically after picking
19250 git-gui: Avoid using the term URL when specifying repositories
19251 git-gui: Make input boxes in init/clone/open dialogs consistent
19252 git-gui: Fix removing non-pushable remotes
19253 git-gui: Fix fetching from remotes when adding them
19254 gitweb: Clean-up sorting of project list
19255 gitweb: Quote non-displayable characters in hex, not octal
19256 config.c: Tolerate UTF8 BOM at the beginning of config file
19257 gitweb: Identify all summary metadata table rows
19258 gitweb: Add support for extending the action bar with custom links
19259 gitweb: Support for tag clouds
19260 gitweb: Make the by_tag filter delve in forks as well
19261 gitweb: Support for simple project search form
19262 Do not rename read-only files during a push
19264 Pierre Habouzit (8):
19265 Enable threaded delta search on *BSD and Linux.
19266 parse-opt: migrate fmt-merge-msg.
19267 parse-opt: migrate git-merge-base.
19268 parse-opt: migrate builtin-merge-file.
19269 git send-email: make the message file name more specific.
19270 git send-email: interpret unknown files as revision lists
19271 git send-email: add --annotate option
19272 git send-email: ask less questions when --compose is used.
19275 builtin-reflog: Allow reflog expire to name partial ref
19276 builtin-commit.c: show on which branch a commit was added
19277 git wrapper: also use aliases to correct mistyped commands
19280 Update RPM spec for the new location of git-cvsserver.
19282 Ralf Wildenhues (2):
19283 Correct typos in RelNotes-1.6.1
19284 Fix typos in the documentation.
19286 Raphael Zimmerer (1):
19287 git grep: Add "-z/--null" option as in GNU's grep.
19290 log: add load_ref_decorations()
19291 move load_ref_decorations() to log-tree.c and export it
19292 add '%d' pretty format specifier to show decoration
19293 add alloc_ref_with_prefix()
19294 use alloc_ref_from_str() everywhere
19295 make alloc_ref_from_str() the new alloc_ref()
19296 blame: inline get_patch()
19297 add xdi_diff_hunks() for callers that only need hunk lengths
19298 blame: use xdi_diff_hunks(), get rid of struct patch
19299 add strbuf_expand_dict_cb(), a helper for simple cases
19300 merge-recursive: use strbuf_expand() instead of interpolate()
19301 daemon: use strbuf_expand() instead of interpolate()
19302 daemon: inline fill_in_extra_table_entries()
19303 daemon: deglobalize variable 'directory'
19304 remove the unused files interpolate.c and interpolate.h
19307 gitk: Bind Key-Return to create on new branch dialog
19309 Robert Shearman (4):
19310 git-imap-send: Allow the program to be run from subdirectories of a git tree
19311 git-imap-send: Support SSL
19312 imap-send.c: style fixes
19313 Documentation: Improve documentation for git-imap-send(1)
19315 Romain Francoise (1):
19316 builtin-help: fallback to GIT_MAN_VIEWER before man
19319 bash: use for-each-ref format 'refname:short'
19320 remove vim syntax highlighting in favor of upstream
19321 bash: complete full refs
19323 Samuel Tardieu (1):
19324 Fix deletion of last character in levenshtein distance
19327 rev-list documentation: clarify the two parts of history simplification
19329 Shawn O. Pearce (7):
19330 Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}'
19331 git-gui: Hide commit related UI during citool --nocommit
19332 git-gui: Use gitattribute "encoding" for file content display
19333 git-gui: Assume `blame --incremental` output is in UTF-8
19334 git-gui: Show/hide "Sign Off" based on nocommitmsg option
19335 describe: Make --tags and --all match lightweight tags more often
19336 Update the po template
19338 Simon Hausmann (1):
19339 Make it possible to abort the submission of a change to Perforce
19342 Fix commit_tree() buffer leak
19343 merge-recursive.c: Add more generic merge_recursive_generic()
19345 Stephen Haberman (8):
19346 rebase--interactive: fix parent rewriting for dropped commits
19347 rebase-i-p: test to exclude commits from todo based on its parents
19348 rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEAD
19349 rebase-i-p: delay saving current-commit to REWRITTEN if squashing
19350 rebase-i-p: fix 'no squashing merges' tripping up non-merges
19351 rebase-i-p: only list commits that require rewriting in todo
19352 rebase-i-p: do not include non-first-parent commits touching UPSTREAM
19353 rebase-i-p: if todo was reordered use HEAD as the rewritten parent
19355 Stephen R. van den Berg (4):
19356 git-daemon: call logerror() instead of error()
19357 git-daemon: use LOG_PID, simplify logging code
19358 git-daemon: Simplify dead-children reaping logic
19359 git-daemon: rewrite kindergarden, new option --max-connections
19362 bash completion: Add --[no-]validate to "git send-email"
19365 filter-branch: Extend test to show rewriting bug
19366 filter-branch: fix ref rewriting with --subdirectory-filter
19367 filter-branch: use --simplify-merges
19368 Documentation: rev-list-options: move --simplify-merges documentation
19369 rev-list: fix --reverse interaction with --parents
19370 t6013: replace use of 'tac' with equivalent Perl
19371 git svn: catch lack of upstream info for dcommit earlier
19372 git svn info: tests: let 'init' test run with SVN 1.5
19373 git svn info: tests: do not use set -e
19374 git svn info: tests: use test_cmp instead of git-diff
19375 git svn info: tests: fix ptouch argument order in setup
19376 git svn info: make info relative to the current directory
19377 git svn info: always quote URLs in 'info' output
19378 git-svn: match SVN 1.5 behaviour of info' on unknown item
19379 git-svn: fix 'info' tests for unknown items
19380 Documentation: new upstream rebase recovery section in git-rebase
19381 Documentation: Refer to git-rebase(1) to warn against rewriting
19382 Documentation: remove stale howto/rebase-and-edit.txt
19383 Documentation: add manpage about workflows
19385 Tom Preston-Werner (1):
19386 connect.c: add a way for git-daemon to pass an error back to client
19388 Tommi Virtanen (1):
19389 Install git-shell in bindir, too
19391 Tor Arvid Lund (1):
19392 git-p4: Fix checkout bug when using --import-local.
19395 send-email: Fix Pine address book parsing
19398 Teach/Fix pull/fetch -q/-v options
19399 Retain multiple -q/-v occurrences in git pull
19402 Version v1.6.0.6; changes since v1.6.0.5:
19403 -----------------------------------------
19406 git-mergetool: properly handle "git mergetool -- filename"
19409 git-svn: Make following parents atomic
19412 git-config.txt: fix a typo
19414 Johannes Schindelin (2):
19415 fast-import: close pack before unlinking it
19416 fast-export: deal with tag objects that do not have a tagger
19418 Junio C Hamano (6):
19419 work around Python warnings from AsciiDoc
19420 git-show: do not segfault when showing a bad tag
19421 pager: do not dup2 stderr if it is already redirected
19422 gitweb: do not run "git diff" that is Porcelain
19424 fast-import: make tagger information optional
19426 Linus Torvalds (1):
19427 fsck: reduce stack footprint
19429 Markus Heidelberg (1):
19430 Documentation: fix typos, grammar, asciidoc syntax
19433 SubmittingPatches: mention the usage of real name in Signed-off-by: lines
19436 make sure packs to be replaced are closed beforehand
19439 git-send-email: handle email address with quoted comma
19442 Version v1.6.0.5; changes since v1.6.0.4:
19443 -----------------------------------------
19445 Alexandre Julliard (2):
19446 checkout: Don't crash when switching away from an invalid branch.
19447 git-submodule: Avoid printing a spurious message.
19449 Brandon Casey (12):
19450 t7700: demonstrate mishandling of objects in packs with a .keep file
19451 packed_git: convert pack_local flag into a bitfield and add pack_keep
19452 pack-objects: new option --honor-pack-keep
19453 repack: don't repack local objects in packs with .keep file
19454 repack: do not fall back to incremental repacking with [-a|-A]
19455 builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
19456 t7700: demonstrate mishandling of loose objects in an alternate ODB
19457 sha1_file.c: split has_loose_object() into local and non-local counterparts
19458 pack-objects: extend --local to mean ignore non-local loose objects too
19459 t7700: test that 'repack -a' packs alternate packed objects
19460 repack: only unpack-unreachable if we are deleting redundant packs
19461 revision.c: use proper data type in call to sizeof() within xrealloc
19464 Fix misleading wording for git-cherry-pick
19466 Christian Couder (3):
19467 Documentation: rev-list: change a few instances of "git-cmd" to "git cmd"
19468 Documentation: bisect: change a few instances of "git-cmd" to "git cmd"
19469 Documentation: fix links to "everyday.html"
19472 Fix non-literal format in printf-style calls
19474 Davide Libenzi (1):
19475 xdiff: give up scanning similar lines early
19477 Jakub Narębski (1):
19478 gitweb: Make project specific override for 'grep' feature work
19481 Documentation: git-svn: fix example for centralized SVN clone
19484 commit: Fix stripping of patch in verbose mode.
19485 tag: delete TAG_EDITMSG only on successful tag
19488 sha1_file: avoid bogus "file exists" error message
19490 Johannes Schindelin (1):
19491 fast-export: use an unsorted string list for extra_refs
19494 compat/mingw.c: Teach mingw_rename() to replace read-only files
19496 Junio C Hamano (8):
19497 Makefile: help people who run 'make check' by mistake
19498 checkout: Fix "initial checkout" detection
19499 Start 1.6.0.5 cycle
19500 builtin-ls-files.c: coding style fix.
19501 Teach ls-files --with-tree=<tree> to work with options other than -c
19502 Teach "git diff" to honour --[no-]ext-diff
19503 Update draft release notes to 1.6.0.5
19506 Linus Torvalds (1):
19507 date/time: do not get confused by fractional seconds
19509 Martin Koegler (1):
19510 git push: Interpret $GIT_DIR/branches in a Cogito compatible way
19513 Remove the period after the git-check-attr summary
19515 Matt McCutchen (3):
19516 config.txt: alphabetize configuration sections
19517 git checkout: don't warn about unborn branch if -f is already passed
19518 "git diff <tree>{3,}": do not reverse order of arguments
19521 Add new testcase to show fast-export does not always exports all tags
19522 User's Manual: remove duplicated url at the end of Appendix B
19523 http.c: use 'git_config_string' to get 'curl_http_proxy'
19525 Nguyễn Thái Ngọc Duy (1):
19526 generate-cmdlist.sh: avoid selecting synopsis at wrong place
19529 Fix pack.packSizeLimit and --max-pack-size handling
19532 git-p4: fix keyword-expansion regex
19534 Ralf Wildenhues (1):
19535 Fix typos in the documentation.
19538 bash: remove dashed command leftovers
19539 bash: offer refs instead of filenames for 'git revert'
19542 sha1_file.c: resolve confusion EACCES vs EPERM
19544 Samuel Tardieu (2):
19545 tag: Check that options are only allowed in the appropriate mode
19546 tag: Add more tests about mixing incompatible modes and options
19549 git ls-remote: make usage string match manpage
19550 request-pull: make usage string match manpage
19553 fetch-pack: Avoid memcpy() with src==dst
19556 Version v1.6.0.4; changes since v1.6.0.3:
19557 -----------------------------------------
19560 Add mksnpath which allows you to specify the output buffer
19561 Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
19562 Fix potentially dangerous uses of mkpath and git_path
19563 Plug a memleak in builtin-revert
19564 Add git_snpath: a .git path formatting routine with output buffer
19565 Fix potentially dangerous use of git_path in ref.c
19566 git_pathdup: returns xstrdup-ed copy of the formatted path
19567 Use git_pathdup instead of xstrdup(git_path(...))
19568 Add --verbose|-v to test-chmtime
19569 Use test-chmtime -v instead of perl in t5000 to get mtime of a file
19571 Charles Bailey (1):
19572 git-archive: work in bare repos
19574 Christian Jaeger (1):
19575 Git.pm: do not break inheritance
19577 Clemens Buchacher (2):
19578 do not force write of packed refs
19579 push: fix local refs update if already up-to-date
19582 git-svn: change dashed git-config to git config
19583 git-svn: change dashed git-commit-tree to git commit-tree
19585 Gustaf Hendeby (1):
19586 git-gui: Help identify aspell version on Windows too
19588 Jakub Narębski (1):
19589 Documentation/gitattributes: Add subsection header for each attribute
19592 Documentation: clarify information about 'ident' attribute
19595 refactor handling of "other" files in ls-files and status
19596 correct cache_entry allocation
19597 pack-objects: avoid reading uninitalized data
19598 fix overlapping memcpy in normalize_absolute_path
19599 send-pack: do not send out single-level refs such as refs/stash
19601 Johannes Schindelin (1):
19602 Fix fetch/pull when run without --update-head-ok
19605 asciidoc: add minor workaround to add an empty line after code blocks
19607 Junio C Hamano (9):
19608 pull: allow "git pull origin $something:$current_branch" into an unborn branch
19609 Fix "checkout --track -b newbranch" on detached HEAD
19610 reset --hard/read-tree --reset -u: remove unmerged new paths
19611 demonstrate breakage of detached checkout with symbolic link HEAD
19612 Enhance hold_lock_file_for_{update,append}() API
19613 Start 1.6.0.4 cycle
19614 Update draft 1.6.0.4 release notes
19615 format-patch documentation: mention the special case of showing a single commit
19618 Linus Torvalds (1):
19619 Add file delete/create info when we overflow rename_limit
19621 Markus Heidelberg (1):
19622 bash completion: add doubledash to "git show"
19624 Mikael Magnusson (1):
19625 Document that git-log takes --all-match.
19628 Fix git branch -m for symrefs.
19629 rename_ref(): handle the case when the reflog of a ref does not exist
19630 Fix git update-ref --no-deref -d.
19631 git branch -m: forbid renaming of a symref
19632 update-ref --no-deref -d: handle the case when the pointed ref is packed
19634 Nanako Shiraishi (1):
19635 Install git-cvsserver in $(bindir)
19637 Pierre Habouzit (1):
19638 git send-email: avoid leaking directory file descriptors.
19641 Update RPM spec for the new location of git-cvsserver.
19644 add -p: warn if only binary changes present
19646 Tom Preston-Werner (1):
19647 add instructions on how to send patches to the mailing list with Gmail
19649 Tommi Virtanen (1):
19650 Install git-shell in bindir, too
19653 Add reference for status letters in documentation.
19656 Version v1.6.0.3; changes since v1.6.0.2:
19657 -----------------------------------------
19659 Abhijit Bhopatkar (1):
19660 Documentation: Clarify '--signoff' for git-commit
19663 git-svn: factor out svnserve test code for later use
19664 git-svn: Always create a new RA when calling do_switch for svn://
19667 Remove empty directories in recursive merge
19668 Add remove_path: a function to remove as much as possible of a path
19669 Use remove_path from dir.c instead of own implementation
19671 Alexander Gavrilov (1):
19672 builtin-blame: Fix blame -C -C with submodules.
19674 Björn Steinbrink (1):
19675 force_object_loose: Fix memory leak
19677 Brandon Casey (14):
19678 t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
19679 t9700/test.pl: remove File::Temp requirement
19680 diff.c: return pattern entry pointer rather than just the hunk header pattern
19681 diff.c: associate a flag with each pattern and use it for compiling regex
19682 diff.*.xfuncname which uses "extended" regex's for hunk header selection
19683 t4018-diff-funcname: test syntax of builtin xfuncname patterns
19684 builtin-prune.c: prune temporary packs in <object_dir>/pack directory
19685 git-stash.sh: don't default to refs/stash if invalid ref supplied
19686 builtin-merge.c: allocate correct amount of memory
19687 git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
19688 remote.c: correct the check for a leading '/' in a remote name
19689 t4018-diff-funcname: rework negated last expression test
19690 t4018-diff-funcname: demonstrate end of line funcname matching flaw
19691 xdiff-interface.c: strip newline (and cr) from line before pattern matching
19693 Charles Bailey (2):
19694 Add new test to demonstrate git archive core.autocrlf inconsistency
19695 Make git archive respect core.autocrlf when creating zip format archives
19698 Documentation: clarify the details of overriding LESS via core.pager
19701 contrib: update packinfo.pl to not use dashed commands
19703 Daniel Barkalow (1):
19704 Check early that a new branch is new and valid
19706 David Soria Parra (1):
19707 Solaris: Use OLD_ICONV to avoid compile warnings
19710 maint: check return of split_cmdline to avoid bad config strings
19711 git init: --bare/--shared overrides system/global config
19713 Dmitry Potapov (4):
19714 git-rebase-interactive: do not squash commits on abort
19715 git-rebase--interactive: auto amend only edited commit
19716 make prefix_path() never return NULL
19717 do not segfault if make_cache_entry failed
19720 completion: git commit should list --interactive
19723 git-svn: fix handling of even funkier branch names
19725 Fabrizio Chiarello (1):
19726 builtin-clone: fix typo
19729 Clarified gitattributes documentation regarding custom hunk header.
19731 Giuseppe Bilotta (1):
19732 gitweb: remove PATH_INFO from $my_url and $my_uri
19735 Start conforming code to "git subcmd" style part 3
19736 Cosmetical command name fix
19739 builtin-apply: fix typo leading to stack corruption
19741 Jakub Narębski (2):
19742 gitweb: Fix two 'uninitialized value' warnings in git_tree()
19743 gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.sh
19746 Makefile: do not set NEEDS_LIBICONV for Solaris 8
19747 git apply --directory broken for new files
19748 tests: shell negation portability fix
19751 gitweb: avoid warnings for commits without body
19754 for-each-ref: Fix --format=%(subject) for log message without newlines
19755 Use strchrnul() instead of strchr() plus manual workaround
19757 Johannes Schindelin (2):
19758 git rm: refresh index before up-to-date check
19759 rebase -i: do not fail when there is no commit to cherry-pick
19762 git-remote: do not use user input in a printf format string
19763 git-push.txt: Describe --repo option in more detail
19766 checkout: Do not show local changes when in quiet mode
19767 git-check-attr(1): add output and example sections
19769 Junio C Hamano (15):
19770 discard_cache: reset lazy name_hash bit
19771 diff Porcelain: do not disable auto index refreshing on -C -C
19772 diff --quiet: make it synonym to --exit-code >/dev/null
19773 Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
19774 Fix permission bits on sources checked out with an overtight umask
19775 checkout: do not lose staged removal
19776 diff/diff-files: do not use --cc too aggressively
19777 Start draft release notes for 1.6.0.3
19778 diff: use extended regexp to find hunk headers
19779 diff hunk pattern: fix misconverted "\{" tex macro introducers
19780 Update draft release notes to 1.6.0.3
19781 diff(1): clarify what "T"ypechange status means
19782 Hopefully the final draft release notes update before 1.6.0.3
19783 Fix testcase failure when extended attributes are in use
19786 Linus Torvalds (1):
19787 fix bogus "diff --git" header from "diff --no-index"
19790 git-svn: call 'fatal' correctly in set-tree
19792 Matt McCutchen (1):
19793 t1301-shared-repo.sh: don't let a default ACL interfere with the test
19795 Michael J Gruber (1):
19796 make "git remote" report multiple URLs
19798 Michael Prokop (1):
19799 Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)
19801 Mikael Magnusson (4):
19802 Typo "bogos" in format-patch error message.
19803 git-repack uses --no-repack-object, not --no-repack-delta.
19804 Fix a few typos in relnotes
19805 Typo "does not exists" when git remote update remote.
19808 test-lib: fix color reset in say_color()
19809 Add testcase to ensure merging an early part of a branch is done properly
19811 Nanako Shiraishi (2):
19812 docs: describe pre-rebase hook
19813 Teach rebase -i to honor pre-rebase hook
19816 fix pread()'s short read in index-pack
19817 rehabilitate 'git index-pack' inside the object store
19820 Do not perform cross-directory renames when creating packs
19823 git-submodule: Fix "Unable to checkout" for the initial 'update'
19825 Rafael Garcia-Suarez (1):
19826 Clarify commit error message for unmerged files
19829 t0024: add executable permission
19830 Documentation: remove '\' in front of short options
19831 rebase -i: proper prepare-commit-msg hook argument when squashing
19832 rebase -i: remove leftover debugging
19833 bash: remove fetch, push, pull dashed form leftovers
19835 Samuel Tardieu (1):
19836 Do not use errno when pread() returns 0
19838 Shawn O. Pearce (3):
19839 Update release notes for 1.6.0.3
19840 Update release notes for 1.6.0.3
19841 test-lib: fix broken printf
19843 Stephen Haberman (1):
19844 Clarify how the user can satisfy stash's 'dirty state' check.
19847 sha1_file: link() returns -1 on failure, not errno
19849 Todd Zullinger (1):
19850 Use dashless git commands in setgitperms.perl
19853 Fix fetch/clone --quiet when stdout is connected
19856 Bust the ghost of long-defunct diffcore-pathspec.
19858 martin f. krafft (1):
19859 Improve git-log documentation wrt file filters
19862 Version v1.6.0.2; changes since v1.6.0.1:
19863 -----------------------------------------
19866 Fix use of hardlinks in "make install"
19868 Alexander Gavrilov (1):
19869 git-gui: Fix string escaping in po2msg.sh
19871 Alexandre Bourget (2):
19872 git-gui: Update french translation
19873 git-gui: update all remaining translations to French.
19875 Andreas Färber (1):
19876 Makefile: always provide a fallback when hardlinks fail
19878 Arjen Laarhoven (1):
19879 Use compatibility regex library for OSX/Darwin
19881 Ask Bjørn Hansen (1):
19882 Document sendemail.envelopesender configuration
19884 Björn Steinbrink (1):
19885 for-each-ref: Allow a trailing slash in the patterns
19887 Clemens Buchacher (2):
19888 git gui: show diffs with a minimum of 1 context line
19889 clone: fix creation of explicitly named target directory
19891 Gustaf Hendeby (1):
19892 Document clarification: gitmodules, gitattributes
19895 Start conforming code to "git subcmd" style
19896 Improve documentation for --dirstat diff option
19897 Start conforming code to "git subcmd" style part 2
19900 Fix "git log -i --grep"
19901 pretty=format: respect date format options
19902 checkout: fix message when leaving detached HEAD
19903 Use compatibility regex library also on FreeBSD
19906 Bring local clone's origin URL in line with that of a remote clone
19909 Use compatibility regex library also on AIX
19912 Fix passwd(5) ref and reflect that commit doens't use commit-tree
19914 Junio C Hamano (17):
19915 ctype.c: protect tiny C preprocessor constants
19916 shell: do not play duplicated definition games to shrink the executable
19917 Fix example in git-name-rev documentation
19918 git-apply: Loosen "match_beginning" logic
19919 checkout: do not check out unmerged higher stages randomly
19920 gitattributes: -crlf is not binary
19921 diff: Help "less" hide ^M from the output
19922 'git foo' program identifies itself without dash in die() messages
19923 Start 1.6.0.2 maintenance cycle
19924 diff --cumulative is a sub-option of --dirstat
19925 log --author/--committer: really match only with name part
19926 "blame -c" should be compatible with "annotate"
19927 Mention the fact that 'git annotate' is only for backward compatibility.
19928 stash: refresh the index before deciding if the work tree is dirty
19929 Update draft release notes for 1.6.0.2
19930 Update draft release notes for 1.6.0.2
19933 Linus Torvalds (2):
19934 index-pack: be careful after fixing up the header/footer
19935 Fix '--dirstat' with cross-directory renaming
19938 Git.pm: Use File::Temp->tempfile instead of ->new
19939 git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl
19942 Makefile: add merge_recursive.h to LIB_H
19943 t7501: always use test_cmp instead of diff
19945 Nanako Shiraishi (4):
19946 tests: use "git xyzzy" form (t0000 - t3599)
19947 tests: use "git xyzzy" form (t3600 - t6999)
19948 tests: use "git xyzzy" form (t7000 - t7199)
19949 tests: use "git xyzzy" form (t7200 - t9001)
19951 Nguyễn Thái Ngọc Duy (6):
19952 index-pack: setup git repository
19953 diff*: fix worktree setup
19954 grep: fix worktree setup
19955 read-tree: setup worktree if merge is required
19956 update-index: fix worktree setup
19957 setup_git_directory(): fix move to worktree toplevel directory
19960 discard revindex data when pack list changes
19961 pack-objects: improve returned information from write_one()
19962 improve reliability of fixup_pack_header_footer()
19963 pack-objects: use fixup_pack_header_footer()'s validation mode
19964 index-pack: use fixup_pack_header_footer()'s validation mode
19965 fixup_pack_header_footer(): use nicely aligned buffer sizes
19966 improve handling of sideband message display
19969 make git-shell paranoid about closed stdin/stdout/stderr
19971 Paolo Ciarrocchi (1):
19972 tutorial: gentler illustration of Alice/Bob workflow using gitk
19975 bash completion: Hide more plumbing commands
19977 Ralf Wildenhues (1):
19978 Fix some manual typos.
19980 Ramsay Allan Jones (2):
19981 Fix a warning (on cygwin) to allow -Werror
19982 Suppress some bash redirection error messages
19985 Documentation: fix reference to a for-each-ref option
19986 Documentation: fix disappeared lines in 'git stash' manpage
19987 Documentation: minor cleanup in a use case in 'git stash' manual
19989 Shawn O. Pearce (2):
19990 pack-objects: Allow missing base objects when creating thin packs
19991 git-gui: Fix diff parsing for lines starting with "--" or "++"
19994 config.txt: Add missing colons after option name
19997 Document gitk --argscmd flag.
20000 Version v1.6.0.1; changes since v1.6.0:
20001 ---------------------------------------
20003 Alexander Gavrilov (1):
20004 Respect core.autocrlf in combined diff
20007 t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'
20008 revision.h: make show_early_output an extern which is defined in revision.c
20009 compat/snprintf.c: handle snprintf's that always return the # chars transmitted
20012 mailinfo: re-fix MIME multipart boundary parsing
20015 Completion: add missing '=' for 'diff --diff-filter'
20018 git-svn: fix dcommit to urls with embedded usernames
20021 mailinfo: avoid violating strbuf assertion
20022 decorate: allow const objects to be decorated
20025 git format-patch: avoid underrun when format.headers is empty or all NLs
20026 remote.c: remove useless if-before-free test
20029 Install templates with the user and group of the installing personality
20031 Jonathan Nieder (2):
20032 Documentation: clarify pager.<cmd> configuration
20033 Documentation: clarify pager configuration
20035 Junio C Hamano (9):
20036 Start 1.6.0.X maintenance series
20037 diff --check: do not get confused by new blank lines in the middle
20038 for-each-ref: cope with tags with incomplete lines
20039 completion: find out supported merge strategies correctly
20040 "git-merge": allow fast-forwarding in a stat-dirty tree
20041 Update draft release notes for 1.6.0.1
20042 unpack_trees(): protect the handcrafted in-core index from read_cache()
20043 merge: fix numerus bugs around "trivial merge" area
20047 Fix 'git help help'
20048 Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX
20050 Robert Schiele (1):
20051 adapt git-cvsserver manpage to dash-free syntax
20053 Simon Hausmann (1):
20054 Clean up the git-p4 documentation
20056 Tarmigan Casebolt (1):
20057 Add hints to revert documentation about other ways to undo changes
20059 Tor Arvid Lund (1):
20060 git-p4: Fix one-liner in p4_write_pipe function.
20063 Version v1.6.0; changes since v1.6.0-rc3:
20064 -----------------------------------------
20067 Fix t3700 on filesystems which do not support question marks in names
20069 Alexander Gavrilov (1):
20070 gitk: Allow safely calling nukefile from a run queue handler
20073 Create a specific version of the read_pipe_lines command for p4 invocations
20074 Utilise the new 'p4_read_pipe_lines' command
20075 Have a command that specifically invokes 'p4' (via system)
20076 Utilise the new 'p4_system' function.
20077 Add a single command that will be used to construct the 'p4' command
20078 If we are in verbose mode, output what we are about to run (or return)
20079 Switch to using 'p4_build_cmd'
20080 If the user has configured various parameters, use them.
20081 Consistently use 'git-p4' for the configuration entries
20082 Move git-p4.syncFromOrigin into a configuration parameters section
20083 Put some documentation in about the parameters that have been added
20084 Put in the two other configuration elements found in the source
20085 Add p4 read_pipe and write_pipe wrappers
20086 Utilise our new p4_read_pipe and p4_write_pipe wrappers
20089 test-parse-options: use appropriate cast in length_callback
20090 t5304-prune: adjust file mtime based on system time rather than file mtime
20093 Makefile: building git in cygwin 1.7.0
20096 bash completion: 'git apply' should use 'fix' not 'strip'
20098 Junio C Hamano (1):
20102 Fix escaping of glob special characters in pathspecs
20105 bash completion: Add completion for 'git mergetool'
20106 bash completion: Add '--merge' long option for 'git log'
20109 bash-completion: Add non-command git help files to bash-completion
20110 Git.pm: Make File::Spec and File::Temp requirement lazy
20112 Matt McCutchen (1):
20113 git format-patch documentation: clarify what --cover-letter does
20116 Documentation: document the pager.* configuration setting
20117 t9300: replace '!' with test_must_fail
20120 git-p4: chdir now properly sets PWD environment variable in msysGit
20122 Shawn O. Pearce (1):
20126 git-am: ignore --binary option
20127 git-stash: improve synopsis in help and manual page
20128 Improve error output of git-rebase
20131 rebase -i -p: handle index and workdir correctly
20132 rebase -i -p: fix parent rewriting
20135 Version v1.6.0-rc3; changes since v1.6.0-rc2:
20136 ---------------------------------------------
20139 Makefile: set SHELL to value of SHELL_PATH
20140 Makefile: add a target which will abort compilation with ancient shells
20143 git-svn: add ability to specify --commit-url for dcommit
20144 git-svn: wrap long lines in a few places
20146 Francis Moreau (1):
20147 git-bisect: fix wrong usage of read(1)
20149 Gustaf Hendeby (2):
20150 gitattributes: Document built in hunk header patterns
20151 Teach git diff about BibTeX head hunk patterns
20153 Ivan Stankovic (1):
20154 Documentation: fix invalid reference to 'mybranch' in user manual
20156 Johannes Schindelin (1):
20157 clone --mirror: avoid storing repeated tags
20159 Jonathan Nieder (1):
20160 Documentation: user-manual: "git commit -a" doesn't motivate .gitignore
20162 Junio C Hamano (9):
20163 asciidoc markup fixes
20164 GIT-VERSION-GEN: mark the version 'dirty' only if there are modified files
20165 mailinfo: fix MIME multi-part message boundary handling
20166 Update draft RelNotes for 1.6.0
20167 Fix deleting reflog entries from HEAD reflog
20168 Re-fix rev-list-options documentation
20169 diff --check: do not unconditionally complain about trailing empty lines
20170 Do not talk about "diff" in rev-list documentation.
20174 Fix multi-glob assertion in git-svn
20175 git-svn: Allow deep branch names by supporting multi-globs
20176 Git.pm: Add faculties to allow temp files to be cached
20177 git-svn: Make it incrementally faster by minimizing temp files
20178 git-svn: Reduce temp file usage when dealing with non-links
20180 Nguyễn Thái Ngọc Duy (1):
20181 Fix typo in comments of longest_ancestor_length()
20184 Fail properly when cloning from invalid HTTP URL
20185 Adjust for the new way of enabling the default post-update hook
20188 builtin-rm: Add a --force flag
20189 reflog test: add more tests for 'reflog delete'
20192 bash: remove redundant check for 'git stash apply' options
20194 Stephen R. van den Berg (1):
20195 git-daemon: SysV needs the signal handler reinstated.
20198 Documentation: commit-tree: remove 16 parents restriction
20199 Documentation: filter-branch: document how to filter all refs
20200 filter-branch: be more helpful when an annotated tag changes
20201 Documentation: rev-list-options: Fix -g paragraph formatting
20202 Documentation: rev-list-options: Fix a typo
20203 Documentation: rev-list-options: Rewrite simplification descriptions for clarity
20206 Version v1.6.0-rc2; changes since v1.6.0-rc1:
20207 ---------------------------------------------
20209 Abhijit Menon-Sen (7):
20210 `git submodule add` now requires a <path>
20211 Make it clear that push can take multiple refspecs
20212 Make the DESCRIPTION match <x>... items in the SYNOPSIS
20213 Git.pm: localise $? in command_close_bidi_pipe()
20214 Fix hash slice syntax error
20215 Fix typo in perl/Git.pm
20216 Fix typos in INSTALL
20219 Make use of stat.ctime configurable
20221 Alexander Gavrilov (9):
20222 git-gui: Fix the Remote menu separator.
20223 git-gui: Preserve scroll position on reshow_diff.
20224 Support copy and rename detection in fast-export.
20225 gitk: Kill back-end processes on window close
20226 gitk: Arrange to kill diff-files & diff-index on quit
20227 gitk: On Windows, use a Cygwin-specific flag for kill
20228 gitk: Fixed broken exception handling in diff
20229 gitk: Fixed automatic row selection during load
20230 gitk: Fallback to selecting the head commit upon load
20232 Anders Melchiorsen (4):
20233 Advertise the ability to abort a commit
20234 Documentation: fix diff.external example
20235 Flush output in start_async
20236 Add output flushing before fork()
20238 Avery Pennarun (2):
20239 Teach "git diff -p" Pascal/Delphi funcname pattern
20240 git-svn: Abort with an error if 'fetch' parameter is invalid.
20243 t/t4202-log.sh: add newline at end of file
20244 Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long
20245 perl/Makefile: handle paths with spaces in the NO_PERL_MAKEMAKER section
20247 Brian Gernhardt (1):
20248 Documentation: Remove mentions of git-svnimport.
20250 Cesar Eduardo Barros (1):
20251 Documentation/git-rev-parse.txt: update for new git-describe output format
20253 Christian Couder (2):
20254 merge-base: die with an error message if not passed a commit ref
20255 documentation: user-manual: update "using-bisect" section
20257 Christian Stimming (2):
20258 git-gui: Update German translation
20259 gitk: Updated German translation
20261 Ciaran McCreesh (1):
20262 Make git-add -i accept ranges like 7-
20264 David D. Kilzer (1):
20265 Fix race condition in t9119-git-svn-info.sh
20267 Dmitry Potapov (1):
20268 correct access right for git-svn-dcommit test
20271 git-svn: properly set path for "info" command
20272 t9119: conditionally re-enable test depending on svn(1) version
20274 Giuseppe Bilotta (2):
20275 diff: add ruby funcname pattern
20276 diff: chapter and part in funcname for tex
20279 init: handle empty "template" parameter
20280 Compact commit template message
20281 init: handle empty "template" parameter
20284 git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.
20286 Johannes Schindelin (3):
20287 sort_in_topological_order(): avoid setting a commit flag
20288 clone: Add an option to set up a mirror
20289 clone --bare: Add ".git" suffix to the directory name to clone into
20292 git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'
20295 Fix reference to Everyday Git, which is an HTML document and not a man page.
20297 Jonathan Nieder (1):
20298 git-diff(1): "--c" -> "--cc" typo fix
20300 Junio C Hamano (19):
20301 Allow building without any git installed
20302 Allow installing in the traditional way
20303 ls-tree documentation: enhance notes on subdirectory and pathspec behaviour
20304 Documentation: clarify what is shown in "git-ls-files -s" output
20305 t7001: fix "git mv" test
20306 Teach gitlinks to ie_modified() and ce_modified_check_fs()
20307 Fix merge name generation in "merge in C"
20308 Fix test-parse-options "integer" test
20309 Teach --find-copies-harder to "git blame"
20310 make sure parsed wildcard refspec ends with slash
20311 Documentation: clarify diff --cc
20312 Update my e-mail address
20313 Start 1.5.6.5 RelNotes to describe accumulated fixes
20314 builtin-name-rev.c: split deeply nested part from the main function
20315 RelNotes 1.5.6.5 updates
20316 fix diff-tree --stdin documentation
20317 Files given on the command line are relative to $cwd
20322 format-patch: Produce better output with --inline or --attach
20325 bash completion: remove unused function _git_diff_tree
20326 bash completion: Add more long options for 'git log'
20327 bash completion: Add completion for 'git grep'
20328 bash completion: Add completion for 'git clone'
20329 bash completion: Add completion for 'git clean'
20330 bash completion: Add completion for 'git init'
20331 bash completion: Add completion for 'git revert'
20332 bash completion: More completions for 'git stash'
20333 bash completion: Add completion for 'git archive'
20334 bash completion: Add completion for 'git ls-files'
20335 bash completion: Add completion for 'git mv'
20337 Linus Torvalds (1):
20338 diff.renamelimit is a basic diff configuration
20340 Michele Ballabio (2):
20341 git-gui: update po/it.po
20342 git-gui: add a part about format strings in po/README
20344 Mikael Magnusson (2):
20345 git-gui: Update swedish translation.
20346 gitk: Update swedish translation.
20349 Documentation: typos / spelling fixes in older RelNotes
20350 Documentation: typos / spelling fixes
20352 Nanako Shiraishi (1):
20353 git-gui: update Japanese translation
20356 builtin-verify-tag: fix -v option parsing
20358 Pierre Habouzit (2):
20359 Allow "non-option" revision options in parse_option-enabled commands
20360 git-submodule: move ill placed shift.
20363 git-name-rev: allow --name-only in combination with --stdin
20366 archive: allow --exec and --remote without equal sign
20367 git-name-rev: don't use printf without format
20369 Shawn O. Pearce (2):
20370 git-gui: Fix gitk search in $PATH to work on Windows
20371 git-gui: Update git-gui.pot for 0.11 nearing release
20373 Steffen Prohaska (6):
20374 Refactor, adding prepare_git_cmd(const char **argv)
20375 run-command (Windows): Run dashless "git <cmd>"
20376 git-gui: Correct installation of library to be $prefix/share
20377 git-gui (Windows): Switch to relative discovery of oguilib
20378 git-gui (Windows): Change wrapper to execdir 'libexec/git-core'
20379 Modify mingw_main() workaround to avoid link errors
20382 builtin-revert.c: typofix
20385 Propagate -u/--upload-pack option of "git clone" to transport.
20388 Optimize sha1_object_info for loose objects, not concurrent repacks
20390 Todd Zullinger (1):
20391 Replace uses of "git-var" with "git var"
20394 Version v1.6.0-rc1; changes since v1.6.0-rc0:
20395 ---------------------------------------------
20397 Abhijit Menon-Sen (2):
20398 git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core
20399 Clarify that "git log x.c y.h" lists commits that touch either file
20402 Allow pager of diff command be enabled/disabled
20404 Alexander Gavrilov (4):
20405 Fix pre-commit hooks under MinGW/MSYS
20406 Add options to control the search for copies in blame.
20407 Kill the blame back-end on window close.
20408 Add a menu item to invoke full copy detection in blame.
20410 Anders Melchiorsen (1):
20411 Documentation: fix diff.external example
20413 Björn Steinbrink (2):
20414 index-pack.c: correctly initialize appended objects
20415 rev-parse: Add support for the ^! and ^@ syntax
20418 git-svn: teach dcommit about svn auto-props
20421 t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diff
20422 t4116-apply-reverse.sh: use $TAR rather than tar
20423 t3200,t7201: replace '!' with test_must_fail
20424 t7502-commit.sh: rearrange test to make more portable
20425 t/t4202-log.sh: add newline at end of file
20426 Teach fsck and prune about the new location of temporary objects
20427 perl/Makefile: update NO_PERL_MAKEMAKER section
20429 Cesar Eduardo Barros (1):
20430 Documentation/git-submodule.txt: fix doubled word
20432 Daniel Barkalow (1):
20433 In perforce, RCS keywords are case-sensitive
20435 Jakub Narębski (1):
20436 gitweb: More about how gitweb gets 'owner' of repository
20438 Johannes Schindelin (9):
20439 Rename .git/rebase to .git/rebase-apply
20440 Rename path_list to string_list
20441 Fix two leftovers from path_list->string_list
20442 Ignore dirty submodule states in "git pull --rebase"
20443 Add test to show that show-branch misses out the 8th column
20444 sort_in_topological_order(): avoid setting a commit flag
20445 builtin-commit: Two trivial style-cleanups
20446 git daemon: avoid waking up too often
20447 Avoid chdir() in list_commands_in_dir()
20449 Johannes Sixt (12):
20450 rebase -i: When an 'edit' stops, mention the commit
20451 Makefile: Do not install a copy of 'git' in $(gitexecdir)
20452 Makefile: Normalize $(bindir) and $(gitexecdir) before comparing
20453 Record the command invocation path early
20454 Fix relative built-in paths to be relative to the command invocation
20455 Allow the built-in exec path to be relative to the command invocation path
20456 Allow add_path() to add non-existent directories to the path
20457 Windows: Make $(gitexecdir) relative
20458 Windows: Make sure argv[0] has a path
20459 Windows: Do not compile git-shell
20460 git-gui: Fix "Stage/Unstage Line" with one line of context.
20461 git-gui: "Stage Line": Treat independent changes in adjacent lines better
20463 Jonathan Nieder (3):
20464 git-diff(1): "--c" -> "--cc" typo fix
20465 document that git-tag can tag more than heads
20466 t6030 (bisect): work around Mac OS X "ls"
20468 Junio C Hamano (13):
20469 Update my e-mail address
20470 Revert "make git-status use a pager"
20471 tests: do not rely on external "patch"
20472 stash save: fix parameter handling
20473 builtin-branch.c: remove unused code in append_ref() callback function
20474 builtin-branch.c: optimize --merged and --no-merged
20475 Documentation: clarify diff --cc
20476 ignore non-existent refs in dwim_log()
20477 tests: propagate $(TAR) down from the toplevel Makefile
20478 Makefile: fix shell quoting
20479 Documentation: clarify how to disable elements in core.whitespace
20480 make sure parsed wildcard refspec ends with slash
20484 builtin-branch: remove duplicated code
20485 builtin-branch: factor out merge_filter matching
20486 builtin-branch: fix -v for --[no-]merged
20489 bash completion: Add long options for 'git rm'
20490 bash completion: Add completion for 'git help'
20493 builtin-merge: give a proper error message for invalid strategies in config
20494 t7601: extend the 'merge picks up the best result' test
20496 Nikolaj Schumacher (1):
20497 Don't cut off last character of commit descriptions.
20500 git-am: remove dash from help message
20501 parse-options: fix segmentation fault when a required value is missing
20502 git am --skip: clean the index while preserving local changes
20503 update test case to protect am --skip behaviour
20506 svnimport: newer libsvn wants us to ask for the root with "", not "/"
20508 Peter Valdemar Mørch (1):
20509 send-email: find body-encoding correctly
20512 git-filter-branch.sh: Allow running in bare repositories
20513 Documentation/git-filter-branch: teach "rm" instead of "update-index --remove"
20514 git-mv: Remove dead code branch
20515 git-mv: Keep moved index entries inact
20517 Philippe Bruhat (1):
20518 mailinfo: better parse email adresses containg parentheses
20520 Pierre Habouzit (4):
20521 builtin-merge: add missing structure initialization
20522 git-submodule: move ill placed shift.
20523 git-checkout: fix command line parsing.
20524 git-checkout: improve error messages, detect ambiguities.
20527 archive: add write_archive()
20528 archive: move parameter parsing code to archive.c
20529 archive: define MAX_ARGS where it's needed
20530 archive: declare struct archiver where it's needed
20531 archive: allow --exec and --remote without equal sign
20534 checkout: mention '--' in the docs
20535 bash: offer only paths after '--' for 'git checkout'
20537 Shawn O. Pearce (2):
20538 git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk
20539 fsck: Don't require tmp_obj_ file names are 14 bytes in length
20542 git-am: Add colon before the subject that is printed out as being applied
20543 am --abort: Add to bash-completion and mention in git-rerere documentation
20544 Make non-static functions, that may be static, static
20545 Move launch_editor() from builtin-tag.c to editor.c
20546 editor.c: Libify launch_editor()
20547 git-am: Mention --abort in usage string part of OPTIONS_SPEC
20548 git-reset: Let -q hush "locally modified" messages
20551 Propagate -u/--upload-pack option of "git clone" to transport.
20552 Remove references to git-fetch-pack from "git clone" documentation.
20555 git-completion.bash: provide completion for 'show-branch'
20556 bash completion: Add long options for 'git describe'
20559 Version v1.6.0-rc0; changes since v1.5.6.6:
20560 -------------------------------------------
20562 Abhijit Menon-Sen (4):
20563 git-gui: Move on to the next filename after staging/unstaging a change
20564 git-gui: Don't select the wrong file if the last listed file is staged.
20565 Implement "git stash branch <newbranch> <stash>"
20566 Add a test for "git stash branch"
20569 Move read_revisions_from_stdin from builtin-rev-list.c to revision.c
20570 Teach git-bundle to read revision arguments from stdin like git-rev-list.
20573 Fix use of "perl -i" on Windows
20575 Alexander Gavrilov (3):
20576 Avoid rescanning unchanged entries in search for copies.
20577 Do not try to detect move/copy for entries below threshold.
20578 Support gitlinks in fast-import.
20580 Avery Pennarun (1):
20581 Reword "your branch has diverged..." lines to reduce line length
20584 t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects
20586 Brian Gernhardt (4):
20587 Fix t4017-diff-retval for white-space from wc
20588 Add test results directory to t/.gitignore
20589 Documentation: Point to gitcli(7) from git(1)
20590 Documentation: mention ORIG_HEAD in am, merge, and rebase
20592 Christian Couder (2):
20593 help: check early if we have a command, if not try a documentation topic
20594 Fix "config_error_nonbool" used with value instead of key
20596 Ciaran McCreesh (1):
20597 Make git-add -i accept ranges like 7-
20599 Cristian Peraferrer (1):
20600 Print errno upon failure to open the COMMIT_EDITMSG file
20602 Daniel Barkalow (1):
20603 Only use GIT_CONFIG in "git config", not other programs
20606 Implement normalize_absolute_path
20607 Fold test-absolute-path into test-path-utils
20608 Add support for GIT_CEILING_DIRECTORIES
20609 Eliminate an unnecessary chdir("..")
20611 Dmitry Kakurin (1):
20612 Fixed text file auto-detection: treat EOF character 032 at the end of file as printable
20614 Dmitry Potapov (4):
20615 update-hook-example: optionally allow non-fast-forward
20616 shrink git-shell by avoiding redundant dependencies
20617 completion.bash: add 'skip' and 'run' to git-bisect
20618 git-svn: fix git svn info to work without arguments
20621 git-apply: handle a patch that touches the same path more than once better
20624 user-manual: typo and grammar fixes
20625 Documentation: fix broken "linkgit" links
20628 Documentation: tweak use case in "git stash save --keep-index"
20629 completion: add branch options --contains --merged --no-merged
20630 Teach lookup_prog not to select directories
20633 t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"
20636 Testsuite: Unset CVS_SERVER
20637 testsuite for cvs co -c
20639 Frederik Schwarzer (1):
20643 tutorial: use prompt with user names in example, to clarify who is doing what
20645 Jakub Narębski (4):
20646 gitweb: Separate filling list of projects info
20647 gitweb: Separate generating 'sort by' table header
20648 t/README: Add 'Skipping Tests' section below 'Running Tests'
20649 gitweb: Describe projects_index format in more detail
20652 fix whitespace violations in test scripts
20653 mask necessary whitespace policy violations in test scripts
20654 avoid whitespace on empty line in automatic usage message
20655 avoid trailing whitespace in zero-change diffstat lines
20656 enable whitespace checking of test scripts
20657 clone: create intermediate directories of destination repo
20658 improve for-each-ref test script
20659 Allow per-command pager config
20660 avoid null SHA1 in oldest reflog
20663 Add 'git-p4.allowSubmit' to git-p4
20666 Incorporate fetched packs in future object traversal
20667 Move pack_refs() and friends into libgit
20668 Prepare testsuite for a "git clone" that packs refs
20669 Teach "git clone" to pack refs
20671 Johannes Schindelin (12):
20672 Windows: always chmod(, 0666) before unlink().
20673 commit-tree: lift completely arbitrary limit of 16 parents
20674 Allow git-apply to recount the lines in a hunk (AKA recountdiff)
20675 Add another fast-import example, this time for .zip files
20676 Teach "git apply" to prepend a prefix with "--root=<root>"
20677 git fetch-pack: do not complain about "no common commits" in an empty repo
20678 Allow cherry-picking root commits
20679 Convert CR/LF to LF in tag signatures
20680 Move MERGE_RR from .git/rr-cache/ into .git/
20681 git-gui: MERGE_RR lives in .git/ directly with newer Git versions
20682 shortlog: support --pretty=format: option
20683 Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
20685 Johannes Sixt (38):
20686 Add compat/regex.[ch] and compat/fnmatch.[ch].
20687 Compile some programs only conditionally.
20688 Add target architecture MinGW.
20689 Windows: Use the Windows style PATH separator ';'.
20690 setup.c: Prepare for Windows directory separators.
20691 Windows: Treat Windows style path names.
20692 Windows: Handle absolute paths in safe_create_leading_directories().
20693 Windows: Strip ".exe" from the program name.
20694 Windows: Implement a wrapper of the open() function.
20695 Windows: A minimal implemention of getpwuid().
20696 Windows: Work around misbehaved rename().
20697 Make my_mktime() public and rename it to tm_to_time_t()
20698 Windows: Implement gettimeofday().
20699 Windows: Fix PRIuMAX definition.
20700 Windows: Implement setitimer() and sigaction().
20701 Windows: Wrap execve so that shell scripts can be invoked.
20702 Windows: A pipe() replacement whose ends are not inherited to children.
20703 Windows: Implement start_command().
20704 Windows: A rudimentary poll() emulation.
20705 Windows: Disambiguate DOS style paths from SSH URLs.
20706 Windows: Implement asynchronous functions as threads.
20707 Windows: Work around incompatible sort and find.
20708 Windows: Implement wrappers for gethostbyname(), socket(), and connect().
20709 Windows: Implement a custom spawnve().
20710 Windows: Add a custom implementation for utime().
20711 Windows: Use a customized struct stat that also has the st_blocks member.
20712 Turn builtin_exec_path into a function.
20713 Windows: Compute the fallback for exec_path from the program invocation.
20714 Windows: Use a relative default template_dir and ETC_GITCONFIG
20715 When installing, be prepared that template_dir may be relative.
20716 Windows: Make the pager work.
20717 Windows: Work around an oddity when a pipe with no reader is written to.
20718 Windows: Make 'git help -a' work.
20719 Windows: TMP and TEMP environment variables specify a temporary directory.
20720 git-gui: Implement "Stage/Unstage Line"
20721 t4127-apply-same-fn: Avoid sed -i
20722 Provide fallback definitions of PRIu32 and PRIx32
20723 builtin-clone: rewrite guess_dir_name()
20725 Jonathan Nieder (23):
20726 Documentation: don't assume git-sh-setup and git-parse-remote are in PATH
20727 Documentation: fix links to tutorials and other new manual pages
20728 whitespace fix in Documentation/git-repack.txt
20729 Documentation: complicate example of "man git-command"
20730 git-daemon(1): don't assume git-daemon is in /usr/bin
20731 Documentation: prepare to be consistent about "git-" versus "git "
20732 Documentation: be consistent about "git-" versus "git "
20733 Documentation formatting and cleanup
20734 git-format-patch(1): fix stray \ in output
20735 Documentation: fix gitlinks
20736 manpages: fix bogus whitespace
20738 git-commit(1): depersonalize description
20739 Documentation: rewrap to prepare for "git-" vs "git " change
20740 Documentation: more "git-" versus "git " changes
20741 gitdiffcore(7): fix awkward wording
20742 manpages: italicize command names in synopses
20743 manpages: italicize command names
20744 manpages: italicize git command names (which were in teletype font)
20745 manpages: italicize gitk's name (where it was in teletype font)
20746 manpages: italicize nongit command names (if they are in teletype font)
20747 manpages: italicize git subcommand names (which were in teletype font)
20748 manpages: use teletype font for sample command lines
20751 git-svn: find-rev and rebase for SVN::Mirror repositories
20753 Junio C Hamano (65):
20754 revision traversal: --children option
20755 rev-list --children
20756 builtin-blame.c: move prepare_final() into a separate function.
20757 builtin-blame.c: allow more than 16 parents
20758 git-blame --reverse
20759 rerere: rerere_created_at() and has_resolution() abstraction
20760 git-rerere: detect unparsable conflicts
20761 rerere: remove dubious "tail_optimization"
20762 t4200: fix rerere test
20764 git-shell: accept "git foo" form
20765 Prepare execv_git_cmd() for removal of builtins from the filesystem
20766 pre-rebase hook update
20767 Ship sample hooks with .sample suffix
20768 Keep some git-* programs in $(bindir)
20769 Start draft release notes for 1.6.0
20770 diff --check: explain why we do not care whether old side is binary
20771 check_and_emit_line(): rename and refactor
20772 checkdiff: pass diff_options to the callback
20773 Teach "diff --check" about new blank lines at end
20774 diff --check: detect leftover conflict markers
20775 Update sample pre-commit hook to use "diff --check"
20776 Document the double-dash "rev -- path" disambiguator
20777 t9700: skip when Test::More is not available
20778 Update draft release notes for 1.6.0
20779 Introduce get_merge_bases_many()
20780 Introduce reduce_heads()
20781 Update draft release notes for 1.6.0
20782 apply --root: thinkofix.
20783 Refactor "tracking statistics" code used by "git checkout"
20784 git-status: show the remote tracking statistics
20785 git-branch -v: show the remote tracking statistics
20786 fast-export --export-marks: fix off by one error
20787 stat_tracking_info(): clear object flags used during counting
20788 branch -r -v: do not spit out garbage
20789 git-apply --directory: make --root more similar to GNU diff
20790 Update draft release notes for 1.6.0
20791 Teach "am" and "rebase" to mark the original position with ORIG_HEAD
20792 Tone down warning about GNU Interactive Tools
20793 Documentation: update sections on naming revisions and revision ranges
20794 branch --contains: default to HEAD
20795 branch --merged/--no-merged: allow specifying arbitrary commit
20796 apply: fix copy/rename breakage
20797 Teach merge.log to "git-merge" again
20798 Update draft release notes for 1.6.0
20799 reduce_heads(): protect from duplicate input
20800 git-rebase: report checkout failure
20801 tutorial: clarify "pull" is "fetch + merge"
20802 Update draft release notes to 1.6.0
20803 t/aggregate-results: whitespace fix
20804 Update draft release notes for 1.6.0
20805 read-cache.c: typofix
20806 mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line
20807 rerere.autoupdate: change the message when autoupdate is in effect
20808 builtin-remote.c: fix earlier "skip_prefix()" conversion
20809 t9001 (send-email): Do not use hardcoded /bin/sh in test
20811 Getting closer to 1.6.0-rc0
20812 builtin-add.c: restructure the code for maintainability
20813 git-add --all: add all files
20814 git-add --all: tests
20815 git-add --all: documentation
20816 Link shell with compat layer functions
20817 Move read_in_full() and write_in_full() to wrapper.c
20818 "needs update" considered harmful
20820 Karl Hasselström (2):
20821 Clean up builtin-update-ref's option parsing
20822 Make old sha1 optional with git update-ref -d
20825 git-send-email: Accept fifos as well as files
20827 Lars Noschinski (3):
20828 cvsserver: Add support for packed refs
20829 cvsserver: Add cvs co -c support
20830 cvsserver: Add testsuite for packed refs
20833 test-lib.sh: add --long-tests option
20834 t/test-lib.sh: add test_external and test_external_without_stderr
20835 Git.pm: add test suite
20836 gitweb: standarize HTTP status codes
20837 test-lib.sh: show git init output when in verbose mode
20838 GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy
20840 Linus Torvalds (1):
20841 Shrink the git binary a bit by avoiding unnecessary inline functions
20843 Lukas Sandström (4):
20844 Add a helper script to send patches with Mozilla Thunderbird
20845 Make some strbuf_*() struct strbuf arguments const.
20846 Add some useful functions for strbuf manipulation.
20847 git-mailinfo: use strbuf's instead of fixed buffers
20849 Marius Storm-Olsen (4):
20850 Add an optional <mode> argument to commit/status -u|--untracked-files option
20851 Add argument 'no' commit/status option -u|--untracked-files
20852 Add configuration option for default untracked files mode
20853 Windows: Add a new lstat and fstat implementation based on Win32 API.
20856 install-doc-quick - use git --exec-path to find git-sh-setup
20857 git-submodule - make "submodule add" more strict, and document it
20858 git-submodule - register submodule URL if adding in place
20860 Michele Ballabio (3):
20861 t9301-fast-export.sh: Remove debug line
20862 builtin-merge.c: Fix option parsing
20863 builtin-push.c: Cleanup - use OPT_BIT() and remove some variables
20866 Catch failures from t5540-http-push
20868 Skip t5540-http-push test when USE_CURL_MULTI is undefined
20869 Avoid apache complaining about lack of server's FQDN
20872 We need to check for msys as well as Windows in add--interactive.
20875 A simple script to parse the results from the testcases
20876 Move split_cmdline() to alias.c
20877 Move commit_list_count() to commit.c
20878 Move parse-options's skip_prefix() to git-compat-util.h
20879 Add new test to ensure git-merge handles pull.twohead and pull.octopus
20880 Move read_cache_unmerged() to read-cache.c
20881 git-fmt-merge-msg: make it usable from other builtins
20882 Introduce get_octopus_merge_bases() in commit.c
20883 Add new test to ensure git-merge handles more than 25 refs.
20884 Add new test case to ensure git-merge reduces octopus parents when possible
20885 Retire 'stupid' merge strategy
20886 INSTALL: Update section about git-frotz form.
20887 hg-to-git: avoid raising a string exception
20888 hg-to-git: abort if the project directory is not a hg repo
20889 hg-to-git: rewrite "git-frotz" to "git frotz"
20890 hg-to-git: use git init instead of git init-db
20891 Add new test case to ensure git-merge prepends the custom merge message
20892 git-commit-tree: make it usable from other builtins
20893 Fix t7601-merge-pull-config.sh on AIX
20895 t0001-init.sh: change confusing directory name
20896 t1007-hash-object.sh: use quotes for the test description
20897 git-bisect: use dash-less form on git bisect log
20898 make remove-dashes: apply to scripts and programs as well, not just to builtins
20899 t6021: add a new test for git-merge-resolve
20900 Add a new test for git-merge-resolve
20901 Teach 'git merge' that some merge strategies no longer exist
20903 Nanako Shiraishi (7):
20904 environment.c: remove unused function
20905 config.c: make git_env_bool() static
20906 gitcli: Document meaning of --cached and --index
20907 cache-tree.c: make cache_tree_find() static
20908 builtin-describe.c: make a global variable "pattern" static
20909 parse-options.c: make check_typos() static
20912 Nguyễn Thái Ngọc Duy (1):
20913 Move all dashed-form commands to libexecdir
20915 Nicolas Pitre (11):
20916 call init_pack_revindex() lazily
20917 implement some resilience against pack corruptions
20918 test case for pack resilience against corruptions
20919 refactor pack structure allocation
20920 optimize verify-pack a bit
20921 move show_pack_info() where it belongs
20922 verify-pack: check packed object CRC when using index version 2
20923 verify-pack: test for detection of index v2 object CRC mismatch
20924 repack.usedeltabaseoffset config option now defaults to "true"
20925 pack.indexversion config option now defaults to 2
20926 restore legacy behavior for read_sha1_file()
20929 Documentation: remove {show,whatchanged}.difftree config options
20930 show_stats(): fix stats width calculation
20931 builtin-rerere: more carefully find conflict markers
20933 Patrick Higgins (1):
20934 Remove the use of '--' in merge program invocation
20937 t9600: allow testing with cvsps 2.2, including beta versions
20940 Add ANSI control code emulation for the Windows console
20943 Git.pm: Add remote_refs() git-ls-remote frontend
20944 Documentation/git-submodule.txt: Add Description section
20945 Documentation/RelNotes-1.6.0.txt: Expand on the incompatible packfiles
20946 Documentation/git-submodule.txt: Further clarify the description
20947 Documentation: How to ignore local changes in tracked files
20948 Documentation/git-merge.txt: Partial rewrite of How Merge Works
20950 Pierre Habouzit (13):
20951 parse-opt: have parse_options_{start,end}.
20952 parse-opt: Export a non NORETURN usage dumper.
20953 parse-opt: create parse_options_step.
20954 parse-opt: do not print errors on unknown options, return -2 intead.
20955 parse-opt: fake short strings for callers to believe in.
20956 parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
20957 revisions: split handle_revision_opt() from setup_revisions()
20958 git-blame: migrate to incremental parse-option [1/2]
20959 git-blame: migrate to incremental parse-option [2/2]
20960 parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
20961 git-blame: fix lapsus
20962 git-shortlog: migrate to parse-options partially.
20963 revisions: refactor handle_revision_opt into parse_revision_opt.
20966 builtin-fast-export: Add importing and exporting of revision marks
20968 Rafael Garcia-Suarez (1):
20969 gitweb: remove git_blame and rename git_blame2 to git_blame
20971 Ramsay Allan Jones (4):
20972 Fix some warnings (on cygwin) to allow -Werror
20973 t9113-*.sh: provide user feedback when test skipped
20974 t9100-git-svn-basic.sh: Fix determination of utf-8 locale
20975 git-request-pull: replace call to deprecated peek-remote
20978 Teach new attribute 'export-ignore' to git-archive
20979 archive: remove args member from struct archiver
20980 add context pointer to read_tree_recursive()
20981 archive: add baselen member to struct archiver_args
20982 archive: centralize archive entry writing
20983 archive: unify file attribute handling
20984 archive: remove extra arguments parsing code
20985 archive: make zip compression level independent from core git
20986 archive: remove unused headers
20989 git-gui: Fix accidental staged state toggle when clicking top pixel row
20991 Robert Shearman (1):
20992 git-send-email: Fix authenticating on some servers when using TLS.
20995 stash: introduce 'stash save --keep-index' option
20997 Shawn O. Pearce (2):
20998 Correct documentation for git-push --mirror
20999 bash completion: Remove dashed command completion support
21001 Soeren Finster (1):
21002 git-gui: Exit shortcut in MacOSX repaired
21004 Steffen Prohaska (5):
21005 Windows: Fix ntohl() related warnings about printf formatting
21006 compat/pread.c: Add a forward declaration to fix a warning
21007 Move code interpreting path relative to exec-dir to new function system_path()
21008 help.c: Add support for htmldir relative to git_exec_path()
21009 help (Windows): Display HTML in default browser using Windows' shell API
21011 Stephan Beyer (10):
21012 api-builtin.txt: update and fix typo
21013 t3404: stricter tests for git-rebase--interactive
21014 rerere: Separate libgit and builtin functions
21015 t/test-lib.sh: exit with small negagive int is ok with test_must_fail
21016 t/: Use "test_must_fail git" instead of "! git"
21017 Make usage strings dash-less
21018 git-am/git-mailsplit: correct synopsis for reading from stdin
21019 t3404: test two "preserve merges with -p" cases
21020 Make rebase--interactive use OPTIONS_SPEC
21021 Link git-shell only to a subset of libgit.a
21024 t/Makefile: use specified shell when running aggregation script
21026 Sverre Hvammen Johansen (1):
21027 reduce_heads(): thinkofix
21029 Sverre Rabbelier (2):
21030 Modify test-lib.sh to output stats to t/test-results/*
21031 Hook up the result aggregation in the test makefile.
21034 Don't use dash commands (git-foo) in tutorial-2
21037 bash: Add more option completions for 'git log'
21038 Add target "install-html" the the top level Makefile
21039 bash: Add long option completion for 'git send-email'
21042 git-send-email: add support for TLS via Net::SMTP::SSL
21043 git-send-email: prevent undefined variable warnings if no encryption is set
21044 git-add--interactive: replace hunk recounting with apply --recount
21045 git-add--interactive: remove hunk coalescing
21046 git-add--interactive: manual hunk editing mode
21047 git-send-email: Do not attempt to STARTTLS more than once
21048 Fix apply --recount handling of no-EOL line
21051 Version v1.5.6.6; changes since v1.5.6.5:
21052 -----------------------------------------
21054 Alexander Gavrilov (1):
21055 Fix quadratic performance in rewrite_one.
21058 t5304-prune: adjust file mtime based on system time rather than file mtime
21060 Francis Moreau (1):
21061 git-bisect: fix wrong usage of read(1)
21063 Ivan Stankovic (1):
21064 Documentation: fix invalid reference to 'mybranch' in user manual
21066 Junio C Hamano (8):
21067 Per-ref reflog expiry configuration
21068 Make default expiration period of reflog used for stash infinite
21069 asciidoc markup fixes
21070 Fix deleting reflog entries from HEAD reflog
21071 Re-fix rev-list-options documentation
21072 Do not talk about "diff" in rev-list documentation.
21073 gitweb: do not run "git diff" that is Porcelain
21077 Fix escaping of glob special characters in pathspecs
21079 Linus Torvalds (4):
21080 Split up default "core" config parsing into helper routine
21081 Split up default "user" config parsing into helper routine
21082 Split up default "i18n" and "branch" config parsing into helper routines
21083 Add config option to enable 'fsync()' of object files
21086 Fail properly when cloning from invalid HTTP URL
21089 reflog test: add more tests for 'reflog delete'
21092 Documentation: rev-list-options: Fix -g paragraph formatting
21095 Version v1.5.6.5; changes since v1.5.6.4:
21096 -----------------------------------------
21098 Anders Melchiorsen (1):
21099 Documentation: fix diff.external example
21101 Björn Steinbrink (1):
21102 index-pack.c: correctly initialize appended objects
21105 t/t4202-log.sh: add newline at end of file
21107 Ciaran McCreesh (1):
21108 Make git-add -i accept ranges like 7-
21111 init: handle empty "template" parameter
21114 git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.
21116 Johannes Schindelin (1):
21117 sort_in_topological_order(): avoid setting a commit flag
21119 Jonathan Nieder (2):
21120 fix usage string for git grep
21121 git-diff(1): "--c" -> "--cc" typo fix
21123 Junio C Hamano (12):
21124 refresh-index: fix bitmask assignment
21125 tests: propagate $(TAR) down from the toplevel Makefile
21126 Makefile: fix shell quoting
21127 make sure parsed wildcard refspec ends with slash
21128 Documentation: clarify diff --cc
21129 Update my e-mail address
21130 Start 1.5.6.5 RelNotes to describe accumulated fixes
21131 builtin-name-rev.c: split deeply nested part from the main function
21132 RelNotes 1.5.6.5 updates
21133 fix diff-tree --stdin documentation
21134 Files given on the command line are relative to $cwd
21137 Linus Torvalds (1):
21138 diff.renamelimit is a basic diff configuration
21141 Documentation: typos / spelling fixes in older RelNotes
21143 Peter Valdemar Mørch (1):
21144 send-email: find body-encoding correctly
21146 Pierre Habouzit (2):
21147 git-checkout: fix command line parsing.
21148 git-submodule: move ill placed shift.
21151 git-name-rev: allow --name-only in combination with --stdin
21154 git-name-rev: don't use printf without format
21157 builtin-revert.c: typofix
21160 Propagate -u/--upload-pack option of "git clone" to transport.
21163 Version v1.5.6.4; changes since v1.5.6.3:
21164 -----------------------------------------
21166 Dmitry Potapov (3):
21167 Fix buffer overflow in git-grep
21168 Fix buffer overflow in git diff
21169 Fix buffer overflow in prepare_attr_stack
21171 Johannes Schindelin (3):
21172 git daemon: avoid calling syslog() from a signal handler
21173 Add pretty format %aN which gives the author name, respecting .mailmap
21174 git fetch-pack: do not complain about "no common commits" in an empty repo
21177 t7600-merge: Use test_expect_failure to test option parsing
21179 Junio C Hamano (4):
21180 Start preparing 1.5.6.4 release notes
21181 rev-list: honor --quiet option
21182 http-fetch: do not SEGV after fetching a bad pack idx file
21185 Lars Noschinski (1):
21186 git-cvsserver: fix call to nonexistant cleanupWorkDir()
21188 Lukas Sandström (1):
21189 git-mailinfo: Fix getting the subject from the in-body [PATCH] line
21192 builtin-rm: fix index lock file path
21195 Documentation/git-cherry-pick.txt et al.: Fix misleading -n description
21197 Shawn O. Pearce (9):
21198 Correct pack memory leak causing git gc to try to exceed ulimit
21199 bash completion: Improve responsiveness of git-log completion
21200 bash completion: Don't offer "a.." as a completion for "a."
21201 bash completion: Append space after file names have been completed
21202 bash completion: Resolve git show ref:path<tab> losing ref: portion
21203 index-pack: Refactor base arguments of resolve_delta into a struct
21204 index-pack: Chain the struct base_data on the stack for traversal
21205 index-pack: Track the object_entry that creates each base_data
21206 index-pack: Honor core.deltaBaseCacheLimit when resolving deltas
21209 rebase-i: keep old parents when preserving merges
21210 api-run-command.txt: typofix
21213 Version v1.5.6.3; changes since v1.5.6.2:
21214 -----------------------------------------
21217 git-clone: remove leftover debugging fprintf().
21220 builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'
21221 convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
21222 diff.c: Use 'git_config_string' to get 'diff.external'
21223 http.c: Use 'git_config_string' to clean up SSL config.
21224 builtin-commit.c: Use 'git_config_string' to get 'commit.template'
21226 Christian Couder (1):
21227 Fix "config_error_nonbool" used with value instead of key
21230 git-svn.perl: workaround assertions in svn library 1.5.0
21233 make deleting a missing ref more quiet
21235 Johannes Schindelin (1):
21236 run_command(): respect GIT_TRACE
21238 Junio C Hamano (6):
21239 attribute documentation: keep EXAMPLE at end
21240 clone -q: honor "quiet" option over native transports.
21241 mailinfo: feed the correct line length to decode_transfer_encoding()
21242 Start preparing release notes for 1.5.6.3
21243 t0004: fix timing bug
21246 Linus Torvalds (1):
21247 racy-git: an empty blob has a fixed object name
21249 Lukas Sandström (1):
21250 git-mailinfo: document the -n option
21253 git-submodule - Fix bugs in adding an existing repo as a module
21255 Matthew Ogilvie (1):
21256 Documentation cvs: Clarify when a bare repository is needed
21258 Mikael Magnusson (1):
21259 Fix grammar in git-rev-parse(1).
21261 Nikolaus Schulz (1):
21262 Documentation: be precise about which date --pretty uses
21265 Fix backwards-incompatible handling of core.sharedRepository
21268 bash: offer only paths after '--'
21270 Shawn O. Pearce (1):
21271 Remove unnecessary pack-*.keep file after successful git-clone
21274 git-am: Do not exit silently if committer is unset
21277 Version v1.5.6.2; changes since v1.5.6.1:
21278 -----------------------------------------
21280 Avery Pennarun (1):
21281 git-svn: avoid filling up the disk with temp files.
21283 Björn Steinbrink (1):
21284 git cat-file: Fix memory leak in batch mode
21287 git-svn: don't sanitize remote names in config
21290 fetch: report local storage errors in status table
21291 doc/rev-parse: clarify reflog vs --until for specifying revisions
21292 fetch: give a hint to the user when local refs fail to update
21295 avoid off-by-one error in run_upload_archive
21298 fix git config example syntax
21300 Johannes Schindelin (2):
21301 clone: respect url.insteadOf setting in global configs
21302 clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig
21304 Junio C Hamano (9):
21305 Allow "git-reset path" when unambiguous
21306 diff --check: do not discard error status upon seeing a good line
21307 git-shell: accept "git foo" form
21310 Start draft release notes for 1.5.6.2
21311 Work around gcc warnings from curl headers
21312 Fix executable bits in t/ scripts
21315 Shawn O. Pearce (1):
21316 Fix describe --tags --long so it does not segfault
21319 Fix 'git show' on signed tag of signed tag of commit
21322 Version v1.5.6.1; changes since v1.5.6:
21323 ---------------------------------------
21326 git-merge.sh: fix typo in usage message: sucesses --> succeeds
21327 t7502-commit.sh: test_must_fail doesn't work with inline environment variables
21330 completion: add --graph to log command completion
21332 Dmitry Potapov (1):
21333 fix update-hook-example to work with packed tag references
21336 Documentation: fix formatting in git-svn
21337 git-svn: make rebuild respect rewriteRoot option
21340 for-each-ref: implement missing tag values
21341 clone: create intermediate directories of destination repo
21343 Junio C Hamano (2):
21344 diff -c/--cc: do not include uninteresting deletion before leading context
21347 Linus Torvalds (1):
21348 Make git_dir a path relative to work_tree in setup_work_tree()
21350 Michele Ballabio (1):
21351 parse-options.c: fix documentation syntax of optional arguments
21353 Patrick Higgins (1):
21354 Workaround for AIX mkstemp()
21357 git-rebase.sh: Add check if rebase is in progress
21358 api-builtin.txt: update and fix typo
21359 api-parse-options.txt: Introduce documentation for parse options API
21360 Extend parse-options test suite
21363 Version v1.5.6; changes since v1.5.6-rc3:
21364 -----------------------------------------
21366 Alejandro Mery (1):
21367 git-am: head -1 is obsolete and doesn't work on some new systems
21369 Christian Couder (1):
21370 Documentation: RelNotes-1.5.6: talk about renamed HTML files
21373 clean up error conventions of remote.c:match_explicit
21376 cpio is no longer used by git-clone
21377 Consistency: Use "libcurl" instead of "cURL library" and "curl"
21378 The "curl" executable is no longer required
21380 Junio C Hamano (7):
21381 Makefile: update check-docs target
21382 Update RPM spec to drop curl executable requirement
21383 diff.c: fix emit_line() again not to add extra line
21384 create_tempfile: make sure that leading directories can be accessible by peers
21385 sha1_file.c: simplify parse_pack_index()
21386 builtin-rerere: fix a small leak
21390 gitweb: quote commands properly when calling the shell
21391 gitweb: remove unused parse_ref method
21393 Linus Torvalds (1):
21394 write_loose_object: don't bother trying to read an old object
21397 run-command documentation: fix "memset()" parameter
21398 path-list documentation: document all functions and data structures
21401 Fix approxidate("never") to always return 0
21403 Pierre Habouzit (1):
21404 Make git reflog expire honour core.sharedRepository.
21407 diff: reset color before printing newline
21410 Version v1.5.6-rc3; changes since v1.5.6-rc2:
21411 ---------------------------------------------
21413 Ask Bjørn Hansen (2):
21414 gitweb setup instruction: rewrite HEAD and root as well
21415 send-email: Allow the envelope sender to be set via configuration
21417 Avery Pennarun (2):
21418 git-svn: don't append extra newlines at the end of commit messages.
21419 git-svn: test that extra blank lines aren't inserted in commit messages.
21421 Boyd Lynn Gerber (2):
21422 progress.c: avoid use of dynamic-sized array
21423 Port to 12 other Platforms.
21426 Improve sed portability
21428 Christian Couder (1):
21429 documentation: bisect: remove bits talking about a bisection branch
21431 Flavio Poletti (1):
21432 git-instaweb: improve auto-discovery of httpd and call conventions.
21435 fix typo in tutorial
21437 Geoffrey Irving (1):
21438 doc: adding gitman.info and *.texi to .gitignore
21440 Jakub Narębski (2):
21441 gitweb: Make it work with $GIT containing spaces
21442 Use 'trash directory' thoroughly in t/test-lib.sh
21445 document --pretty=tformat: option
21447 Johannes Schindelin (1):
21448 merge-recursive: respect core.autocrlf when writing out the result
21451 make_nonrelative_path: Use is_absolute_path()
21452 Remove exec bit from builtin-fast-export.c
21454 Junio C Hamano (8):
21455 http-push.c: remove duplicated code
21456 "remote prune": be quiet when there is nothing to prune
21457 Documentation/git-pull.txt: Use more standard [NOTE] markup
21458 Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate output
21459 user-manual: describe how higher stages are set during a merge
21460 t4126: fix test that happened to work due to timing
21461 sha1_file.c: dead code removal
21465 t1006-cat-file.sh: typo
21466 cat-file --batch / --batch-check: do not exit if hashes are missing
21467 Documentation/git-cat-file.txt: add missing line break
21468 t/.gitattributes: only ignore whitespace errors in test files
21470 Linus Torvalds (4):
21471 Consolidate SHA1 object file close
21472 Avoid cross-directory renames and linking on object creation
21473 Make loose object file reading more careful
21474 Simplify and rename find_sha1_file()
21476 Marius Storm-Olsen (1):
21477 Add testcase for merging in a CRLF repo
21480 git-submodule - Fix errors regarding resolve_relative_url
21482 Mikael Magnusson (1):
21486 Don't allocate too much memory in quote_ref_url
21489 Remove unused code in parse_commit_buffer()
21490 git-rebase -i: mention the short command aliases in the todo list
21491 git-read-tree: document -v option.
21494 remote show: fix the -n option
21495 builtin-remote: split show_or_prune() in two separate functions
21496 remote prune: print the list of pruned branches
21497 remote show: list tracked remote branches with -n
21499 Paul Mackerras (1):
21500 gitk: Handle detached heads better
21502 Philippe Bruhat (1):
21503 git-cvsimport: do not fail when CVSROOT is /
21506 git-send-email: allow whitespace in addressee list
21509 Ignore .gitattributes in bare repositories
21512 git add: add long equivalents of '-u' and '-f' options
21513 completion: add more 'git add' options
21515 Shawn O. Pearce (1):
21516 fast-export: Correctly generate initial commits with no parents
21519 git-commit.txt: Correct option alternatives
21520 git-commit.txt: Add missing long/short options
21521 Docs: Use "-l::\n--long\n" format in OPTIONS sections
21522 Docs: add some long/short options
21523 git-describe.txt: document --always
21524 git-name-rev.txt: document --no-undefined and --always
21527 Version v1.5.6-rc2; changes since v1.5.6-rc1:
21528 ---------------------------------------------
21531 graph API: fix "git log --graph --first-parent"
21532 git log --graph: print '*' for all commits, including merges
21535 Fix t5516 on cygwin: it does not like double slashes at the beginning of a path
21537 Björn Steinbrink (1):
21538 name-rev: Fix segmentation fault when using --all
21540 Christian Couder (2):
21541 documentation: convert "diffcore" and "repository-layout" to man pages
21542 documentation: move git(7) to git(1)
21544 Daniel Barkalow (1):
21545 Use nonrelative paths instead of absolute paths for cloned repositories
21547 Dirk Süsserott (1):
21548 Documentation/git-mailsplit: Enhanced description of -o option
21550 Jakub Narębski (1):
21551 gitweb: Add charset info to "raw" output of 'text/plain' blobs
21554 Fix "git clone http://$URL" to check out the worktree when asked
21556 Junio C Hamano (6):
21557 t7502: do not globally unset GIT_COMMITTER_* environment variables
21558 t7502: tighten loosely written test sequence
21559 Documentation: git-log cannot use rev-list specific options
21560 t7502: honor SHELL_PATH
21565 cat-file --batch: flush stdout also when objects are missing
21566 git-for-each-ref.txt: minor improvements
21568 Michael Dressel (1):
21569 describe: match pattern for lightweight tags too
21572 Strbuf documentation: document most functions
21575 Print info about "git help COMMAND" on git's main usage pages
21578 Version v1.5.6-rc1; changes since v1.5.6-rc0:
21579 ---------------------------------------------
21582 graph API: improve display of merge commits
21583 graph API: avoid printing unnecessary padding before some octopus merges
21585 Christian Couder (2):
21586 bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting
21587 Documentation: convert "glossary" and "core-tutorial" to man pages
21589 Christian Engwer (1):
21590 git-svn fails in prop_walk if $self->{path} is not empty
21592 Dmitry V. Levin (1):
21593 builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value
21596 Documentation/git-bundle.txt: fix synopsis
21597 commit --interactive: properly update the index before commiting
21599 Jakub Narębski (2):
21600 gitweb: Remove gitweb/test/ directory
21601 gitweb: Fix "next" link on bottom of page
21604 git-reset: honor -q and do not show progress message
21607 clone: make sure we support the transport type
21609 Johannes Schindelin (1):
21610 hg-to-git: add --verbose option
21613 t5700-clone-reference: Quote $U
21614 Revert "filter-branch: subdirectory filter needs --full-history"
21615 rebase --interactive: Compute upstream SHA1 before switching branches
21617 John J. Franey (1):
21618 Clarify description of <repository> argument to pull/fetch for naming remotes.
21620 Junio C Hamano (25):
21621 tests: do not use implicit "git diff --no-index"
21622 diff-files: do not play --no-index games
21623 "git diff": do not ignore index without --no-index
21624 Update draft release notes for 1.5.6
21625 log --graph: do not accept log --graphbogus
21626 log --pretty: do not accept bogus "--prettyshort"
21627 Release Notes for 1.5.5.2
21628 Documentation/git.txt: link to 1.5.5.2 documentation.
21629 Makefile: fix dependency on wt-status.h
21630 show-branch --current: do not barf on detached HEAD
21631 git-diff: allow --no-index semantics a bit more
21632 git diff --no-index: default to page like other diff frontends
21634 t5100: Avoid filename "nul"
21635 Git::cat_blob: allow using an empty blob to fix git-svn breakage
21636 fix sha1_pack_index_name()
21637 Manual subsection to refer to other pages is SEE ALSO
21638 Documentation: git-cherry uses git-patch-id
21639 "git checkout -- paths..." should error out when paths cannot be written
21640 checkout: make reset_clean_to_new() not die by itself
21641 checkout: consolidate reset_{to_new,clean_to_new}()
21642 unpack_trees(): allow callers to differentiate worktree errors from merge errors
21643 checkout: "best effort" checkout
21644 commit: drop duplicated parents
21647 Karl Hasselström (3):
21648 Add some tests for git update-ref -d
21649 Fix path duplication in git svn commit-diff
21650 Revert "git.el: Set process-environment instead of invoking env"
21653 Documentation/git-filter-branch.txt: Fix description of --commit-filter
21656 gitweb: only display "next" links in logs if there is a next page
21657 t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons
21658 Git.pm: fix documentation of hash_object
21659 glossary: improve a few links
21660 Git.pm: fix return value of config method
21662 Linus Torvalds (2):
21663 Make pack creation always fsync() the result
21664 Remove now unnecessary 'sync()' calls
21667 git-init: accept --bare option
21669 Marius Storm-Olsen (2):
21670 Clearify the documentation for core.ignoreStat
21671 Add shortcut in refresh_cache_ent() for marked entries.
21673 Michele Ballabio (1):
21674 Documentation: fix graph in git-rev-parse.txt
21677 Revision walking documentation: document most important functions
21680 make verify-pack a bit more useful with bad packs
21683 rollback lock files on more signals than just SIGINT
21686 builtin-fast-export: Only output a single parent per line
21689 Add a --dry-run option to git-svn rebase
21691 Shawn O. Pearce (8):
21692 git-gui: Add a --trace command line option
21693 git-gui: Handle workdir detection when CYGWIN=nowinsymlinks
21694 Don't diff empty tree on branch creation in paranoid update hook
21695 Don't load missing ACL files in paranoid update hook
21696 Ignore no-op changes in paranoid update hook
21697 Remove unused remote_prefix member in builtin-remote
21698 Make "git-remote prune" delete refs according to fetch specs
21699 Make "git-remote rm" delete refs acccording to fetch specs
21702 Add test cases for git-am
21703 Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh
21706 git-gui: Vertically align textboxes with labels
21709 Version v1.5.6-rc0; changes since v1.5.5.6:
21710 -------------------------------------------
21713 Add tests for git cat-file
21714 git-cat-file: Small refactor of cmd_cat_file
21715 git-cat-file: Make option parsing a little more flexible
21716 git-cat-file: Add --batch-check option
21717 git-cat-file: Add --batch option
21718 Move git-hash-object tests from t5303 to t1007
21719 Add more tests for git hash-object
21720 git-hash-object: Add --stdin-paths option
21721 Git.pm: Add command_bidi_pipe and command_close_bidi_pipe
21722 Git.pm: Add hash_and_insert_object and cat_blob
21723 git-svn: Speed up fetch
21725 Adam Simpkins (11):
21726 Remove dead code: show_log() sep argument and diff_options.msg_sep
21727 log: print log entry terminator even if the message is empty
21728 revision API: split parent rewriting and parent printing options
21729 Add history graph API
21730 log and rev-list: add --graph option
21731 graph API: eliminate unnecessary indentation
21732 graph API: fix graph mis-alignment after uninteresting commits
21733 graph API: don't print branch lines for uninteresting merge parents
21734 log --graph --left-right: show left/right information in place of '*'
21735 Fix output of "git log --graph --boundary"
21736 get_revision(): honor the topo_order flag for boundary commits
21739 Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh
21740 Improve reporting of errors in config file routines
21741 Make the exit code of add_file_to_index actually useful
21742 Extend interface of add_files_to_cache to allow ignore indexing errors
21743 Add --ignore-errors to git-add to allow it to skip files with read errors
21744 Add a test for git-add --ignore-errors
21745 Add a config option to ignore errors for git-add
21746 Ensure that a test is run in the trash directory
21747 Fix t6031 on filesystems without working exec bit
21748 Fix t3701 if core.filemode disabled
21750 Anders Waldenborg (1):
21751 gitweb: Convert string to internal form before chopping in chop_str
21753 Avery Pennarun (3):
21754 git-svn: add documentation for --use-log-author option.
21755 git-svn: Add --add-author-from option.
21756 git-svn: add documentation for --add-author-from option.
21758 Bart Trojanowski (1):
21759 make git-status use a pager
21762 filter-branch.sh: support nearly proper tag name filtering
21763 compat/fopen.c: avoid clobbering the system defined fopen macro
21764 repack: modify behavior of -A option to leave unreferenced objects unpacked
21765 git-gc: always use -A when manually repacking
21766 builtin-gc.c: deprecate --prune, it now really has no effect
21767 builtin-clone.c: Need to closedir() in copy_or_link_directory()
21768 t/Makefile: "trash" directory was renamed recently
21771 git-rebase.sh: Fix --merge --abort failures when path contains whitespace
21772 config.c: Escape backslashes in section names properly
21773 git-send-email.perl: Handle shell metacharacters in $EDITOR properly
21774 test-lib.sh: Add a test_set_editor function to safely set $VISUAL
21775 Use test_set_editor in t9001-send-email.sh
21776 test-lib.sh: Fix some missing path quoting
21777 lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters
21778 Don't use the 'export NAME=value' in the test scripts.
21779 Fix tests breaking when checkout path contains shell metacharacters
21780 Rename the test trash directory to contain spaces.
21782 Caio Marcelo de Oliveira Filho (1):
21783 git-format-patch: add --no-binary to omit binary changes in the patch.
21786 Documentation/git-prune.txt: document unpacked logic
21787 Documentation/git-repack.txt: document new -A behaviour
21790 Updated status to show 'Not currently on any branch' in red
21792 Christian Couder (21):
21793 bisect: add "git bisect help" subcommand to get a long usage string
21794 help: use man viewer path from "man.<tool>.path" config var
21795 documentation: help: add "man.<tool>.path" config variable
21796 help: use "man.<tool>.cmd" as custom man viewer command
21797 documentation: help: add info about "man.<tool>.cmd" config var
21798 documentation: web--browse: add a note about konqueror
21799 rev-parse: teach "--verify" to be quiet when using "-q" or "--quiet"
21800 rev-parse: fix --verify to error out when passed junk after a good rev
21801 Documentation: hooks: fix missing verb in pre-applypatch description
21802 Documentation: rename "hooks.txt" to "githooks.txt" and make it a man page
21803 Documentation: improve "add", "pull" and "format-patch" examples
21804 Documentation: bisect: add a few "git bisect run" examples
21805 rev-parse: add test script for "--verify"
21806 rev-parse: fix using "--default" with "--verify"
21807 rev-parse --verify: do not output anything on error
21808 Documentation: rev-parse: add a few "--verify" and "--default" examples
21809 bisect: add test cases to check that "git bisect start" is atomic
21810 bisect: fix left over "BISECT_START" file when starting with junk rev
21811 bisect: trap critical errors in "bisect_start"
21812 bisect: use a detached HEAD to bisect
21813 Documentation: convert tutorials to man pages
21815 Christian Stimming (3):
21816 git-gui: Update German translation
21817 gitk: Update German translation
21818 gitk: German translation again updated
21820 Clemens Buchacher (2):
21821 Reset the signal being handled
21822 http-push: remove remote locks on exit signals
21824 Clifford Caoile (1):
21825 git.el: Set process-environment instead of invoking env
21828 completion: allow 'git remote' subcommand completion
21829 completion: remove use of dashed git commands
21830 Allow cherry-pick (and revert) to add signoff line
21832 Daniel Barkalow (12):
21833 Make walker.fetch_ref() take a struct ref.
21834 Make ls-remote http://... list HEAD, like for git://...
21835 Mark the list of refs to fetch as const
21836 Add a lockfile function to append to a file
21837 Add a library function to add an alternate to the alternates file
21838 Have a constant extern refspec for "--tags"
21839 Allow for having for_each_ref() list extra refs
21840 Add a function to set a non-default work tree
21841 Provide API access to init_db()
21843 clone: fall back to copying if hardlinking fails
21844 Test that --reference actually suppresses fetching referenced objects
21846 Dmitry Potapov (1):
21847 git-init: autodetect core.ignorecase
21849 Dustin Sallings (2):
21850 Allow tracking branches to set up rebase by default.
21851 Allow tracking branches to set up rebase by default.
21854 git-svn: fix cloning of HTTP URLs with '+' in their path
21856 Frank Lichtenheld (4):
21857 var: Don't require to be in a git repository.
21858 Git.pm: Don't require a repository instance for config
21859 Git.pm: Don't require repository instance for ident
21860 send-email: Don't require to be called in a repository
21863 gitweb: fallback to system-wide config file if default config does not exist
21864 gitweb: fallback to system-wide config file (fixup)
21865 gitk: Makefile/install: force permissions when installing files and dirs
21867 Govind Salinas (1):
21868 pretty.c: add %x00 format specifier.
21870 Gustaf Hendeby (6):
21871 git-svn: Make create-ignore use git add -f
21872 Documentation: Add create-ignore to git svn manual
21873 Documentation/config.txt: Add git-gui options
21874 Documentation: Add missing git svn commands
21875 Documentation: Fix skipped section level
21876 Make git add -n and git -u -n output consistent
21879 Make core.sharedRepository more generic
21880 Document functions xmemdupz(), xread() and xwrite()
21881 Die for an early EOF in a file reading loop
21882 Make read_in_full() and write_in_full() consistent with xread() and xwrite()
21883 Cleanup xread() loops to use read_in_full()
21884 Add log.date config variable
21885 Remove redundant code, eliminate one static variable
21887 Imran M Yousuf (1):
21888 Use '-f' option to point to the .gitmodules file
21890 Jakub Narębski (1):
21891 gitweb: Use feed link according to current view
21894 add--interactive: ignore mode change in 'p'atch command
21895 add--interactive: allow user to choose mode update
21896 git-fetch: always show status of non-tracking-ref fetches
21897 git-remote: show all remotes with "git remote show"
21898 Documentation: point git-prune users to git-gc
21899 add merge.renamelimit config option
21900 bump rename limit defaults
21901 diff: make "too many files" rename warning optional
21902 fix bsd shell negation
21903 t5000: tar portability fix
21904 clone: bsd shell portability fix
21905 filter-branch: fix variable export logic
21908 Add a test for another combination of --reference
21909 Add test for cloning with "--reference" repo being a subset of source repo
21911 Johannes Schindelin (10):
21912 Provide git_config with a callback-data parameter
21913 builtin-clone: fix initial checkout
21914 cvsexportcommit: chomp only removes trailing whitespace
21915 diff options: Introduce --ignore-submodules
21916 Teach update-index about --ignore-submodules
21917 Ignore dirty submodule states during rebase and stash
21918 cvsexportcommit: introduce -W for shared working trees (between Git and CVS)
21919 submodule update: add convenience option --init
21920 pull --rebase: exit early when the working directory is dirty
21921 mailsplit and mailinfo: gracefully handle NUL characters
21924 builtin-commit.c: Remove a redundant assignment.
21925 git-gui: Report less precise object estimates for database compression
21926 compat-util: avoid macro redefinition warning
21929 Add otherwise missing --strict option to unpack-objects summary.
21931 Junio C Hamano (24):
21932 Optimize rename detection for a huge diff
21933 t5300: add test for "unpack-objects --strict"
21934 unpack-objects: fix --strict handling
21935 rebase [--onto O] A B: omit needless checkout
21936 sha1-lookup: more memory efficient search in sorted list of SHA-1
21937 diff: make --dirstat binary-file safe
21938 sha1-lookup: make selection of 'middle' less aggressive
21939 log: teach "terminator" vs "separator" mode to "--pretty=format"
21940 git_config_bool_or_int()
21941 write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE
21942 diff-files: mark an index entry we know is up-to-date as such
21943 Fix git_config_bool_or_int
21944 First batch of post 1.5.5 updates
21945 diff: a submodule not checked out is not modified
21946 diff-lib.c: rename check_work_tree_entity()
21947 is_racy_timestamp(): do not check timestamp for gitlinks
21948 git-svn: add test for --add-author-from and --use-log-author
21949 builtin-apply: typofix
21950 builtin-apply: accept patch to an empty file
21951 builtin-apply: do not declare patch is creation when we do not know it
21952 unpack-trees: allow Porcelain to give different error messages
21953 "git-add -n -u" should not add but just report
21954 mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths
21955 mailsplit: minor clean-up in read_line_with_nul()
21958 post-merge: Add it's not executed if merge failed.
21960 Krzysztof Kowalczyk (1):
21961 alloc_ref_from_str(): factor out a common pattern of alloc_ref from string
21964 Add platform-independent .git "symlink"
21965 Teach resolve_gitlink_ref() about the .git file
21966 Teach git-submodule.sh about the .git file
21967 Teach GIT-VERSION-GEN about the .git file
21968 git-branch: add support for --merged and --no-merged
21969 git-branch.txt: compare --contains, --merged and --no-merged
21970 Add tests for `branch --[no-]merged`
21971 revision.c: really honor --first-parent
21973 Linus Torvalds (12):
21974 Make unpack_trees_options bit flags actual bitfields
21975 Move name hashing functions into a file of its own
21976 Make "index_name_exists()" return the cache_entry it found
21977 Make hash_name_lookup able to do case-independent lookups
21978 Add 'core.ignorecase' option
21979 Make branch merging aware of underlying case-insensitive filsystems
21980 Make unpack-tree update removed files before any updated files
21981 When adding files to the index, add support for case-independent matches
21982 Make git-add behave more sensibly in a case-insensitive environment
21983 Optimize match_pathspec() to avoid fnmatch()
21984 Avoid some unnecessary lstat() calls
21985 Optimize symlink/directory detection
21988 Documentation on --git-dir and --work-tree
21990 Marcel Koeppen (2):
21991 Replace in-place sed in t7502-commit
21992 Fix prepare-commit-msg hook and replace in-place sed
21995 Be more careful with objects directory permissions on clone
21997 Martin Koegler (3):
21998 unpack-objects: prevent writing of inconsistent objects
21999 receive-pack: allow using --strict mode for unpacking objects
22000 t5300: add test for "index-pack --strict"
22002 Matthew Ogilvie (3):
22003 git-cvsserver: add mechanism for managing working tree and current directory
22004 implement gitcvs.usecrlfattr
22005 git-cvsserver: add ability to guess -kb from contents
22007 Matthias Kestenholz (1):
22008 Use color.ui variable in scripts too
22011 git-svn: detect and fail gracefully when dcommitting to a void
22013 Michele Ballabio (4):
22014 gitk: Disable "Reset %s branch to here" when on a detached head
22015 gitk: Move es.po where it belongs
22016 builtin-cat-file.c: use parse_options()
22017 change quoting in test t1006-cat-file.sh
22020 Makefile: update the default build options for AIX
22023 git-gc --auto: add pre-auto-gc hook
22024 Documentation/hooks: add pre-auto-gc hook
22025 contrib/hooks: add an example pre-auto-gc hook
22026 git checkout: add -t alias for --track
22027 git-format-patch: add a new format.cc configuration variable
22028 git-send-email: add a new sendemail.cc configuration variable
22029 Add tests for sendemail.cc configuration variable
22030 INSTALL: add a note about GNU interactive tools has been renamed
22031 git-fast-import: rename cmd_*() functions to parse_*()
22032 git-merge: exclude unnecessary options from OPTIONS_SPEC
22033 CodingGuidelines: Add a note to avoid assignments inside if()
22036 pack-objects: small cleanup
22037 pack-objects: remove some double negative logic
22038 pack-objects: simplify the condition associated with --all-progress
22039 pack-objects: clean up write_object() a bit
22040 pack-objects: move compression code in a separate function
22041 pack-objects: allow for early delta deflating
22042 pack-objects: fix early eviction for max depth delta objects
22043 add a force_object_loose() function
22044 let pack-objects do the writing of unreachable objects as loose objects
22047 Add a remote.*.mirror configuration option
22048 add special "matching refs" refspec
22050 Paul Mackerras (40):
22051 gitk: Use git log without --topo-order and reorganize the commits ourselves
22052 gitk: Fix bug in assigning row numbers to arcs
22053 gitk: Fix bug in parsing multiple revision arguments
22054 gitk: Compute row numbers and order tokens lazily
22055 gitk: Fix a couple of bugs
22056 gitk: Fix more bugs resulting in Tcl "no such element in array" errors
22057 gitk: More bug fixes and cleanups
22058 gitk: Implement date mode in the new framework
22059 gitk: Fix another collection of bugs
22060 gitk: Don't try to show local changes from a head that isn't shown
22061 gitk: Keep the same commits visible as other commits come in
22062 gitk: Fix some corner cases in the targetid/targetrow stuff
22063 gitk: Fix a couple of bugs in the find function
22064 gitk: Fix potential bug with fake commit IDs in renumbervarc
22065 gitk: Index [fnvr]highlights by id rather than row
22066 gitk: Fix handling of flag arguments
22067 gitk: Fix a bug in make_disporder
22068 gitk: Select head of current branch by default
22069 gitk: Select something appropriate on cherry-pick, branch reset and checkout
22070 gitk: Fix bug where editing an existing view would cause an infinite loop
22071 gitk: Fix bug causing Tcl error when no commits are selected
22072 gitk: Fix cherry-picking to insert a real row not a fake row
22073 gitk: Cope better with getting commits that we have already seen
22074 gitk: Fix bug where arcs could get lost
22075 gitk: Handle updating with path limiting better
22076 gitk: Fix problems with target row stuff
22077 gitk: Don't filter view arguments through git rev-parse
22078 gitk: Correct a few strings and comments to say "git log"
22079 gitk: Fix some corner cases in computing vrowmod and displayorder
22080 gitk: Avoid a crash in selectline if commitinfo($id) isn't set
22081 gitk: Fix problem with target row not being in scroll region
22082 gitk: Reorganize processing of arguments for git log
22083 gitk: Fix handling of tree file list with special chars in names
22084 gitk: Make updates go faster
22085 gitk: Synchronize highlighting in file view for 'f' and 'b' commands
22086 gitk: Show current row number and total number of rows
22087 gitk: Add a progress bar for checking out a head
22088 gitk: Fix "wrong # coordinates" error on reload
22089 gitk: Fix bug where current row number display stops working
22090 gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"
22093 Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them.
22095 Peter Krefting (1):
22096 gitk: Initial Swedish translation.
22099 git-submodule summary: --for-status option
22100 builtin-status: submodule summary support
22101 builtin-status: Add tests for submodule summary
22102 t4027: test diff for submodule with empty directory
22103 Add t7506 to test submodule related functions for git-status
22105 Rafael Garcia-Suarez (1):
22106 Spelling fixes in the gitweb documentation
22109 bash: Add completion for gitk --merge
22110 Documentation gitk: Describe what --merge does
22113 doc: moved merge.* config variables into separate merge-config.txt
22114 merge, pull: introduce '--(no-)stat' option
22115 add 'merge.stat' config variable
22116 fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
22117 merge, pull: add '--(no-)log' command line option
22120 Preparation to call determine_author_info from prepare_to_commit
22121 commit: Show author if different from committer
22122 commit: Show committer if automatic
22125 gitk: Spanish translation of gitk
22127 Sebastian Schuberth (1):
22128 mergetool: Make ECMerge use the settings as specified by the user in the GUI
22130 Shawn O. Pearce (3):
22131 git-gui: Don't use '$$cr master' with aspell earlier than 0.60
22132 git-gui: Setup branch.remote,merge for shorthand git-pull
22133 git-gui: Delete branches with 'git branch -D' to clear config
22135 Steffen Prohaska (4):
22136 t0050: Test autodetect core.ignorecase
22137 t0050: Set core.ignorecase case to activate case insensitivity
22138 t0050: Add test for case insensitive add
22139 t0050: Fix merge test on case sensitive file systems
22142 builtin-apply.c: use git_config_string() to get apply_default_whitespace
22144 Stephen R. van den Berg (2):
22145 Simplify and fix --first-parent implementation
22146 git-svn: Same default as cvsimport when using --use-log-author
22149 Add svn-compatible "blame" output format to git-svn
22152 Documentation/git-web--browse.txt: fix small typo
22155 gitk: Allow users to view diffs in external diff viewer
22158 cvsexportcommit: Create config option for CVS dir
22161 Version v1.5.5.6; changes since v1.5.5.5:
22162 -----------------------------------------
22164 Junio C Hamano (2):
22165 gitweb: do not run "git diff" that is Porcelain
22169 Version v1.5.5.5; changes since v1.5.5.4:
22170 -----------------------------------------
22173 fix typo in tutorial
22176 Remove exec bit from builtin-fast-export.c
22178 Junio C Hamano (4):
22179 diff.c: fix emit_line() again not to add extra line
22180 git-shell: accept "git foo" form
22185 git-read-tree: document -v option.
22188 diff: reset color before printing newline
22191 Version v1.5.5.4; changes since v1.5.5.3:
22192 -----------------------------------------
22194 Björn Steinbrink (1):
22195 name-rev: Fix segmentation fault when using --all
22197 Junio C Hamano (1):
22201 git-for-each-ref.txt: minor improvements
22203 Michael Dressel (1):
22204 describe: match pattern for lightweight tags too
22207 Version v1.5.5.3; changes since v1.5.5.2:
22208 -----------------------------------------
22210 Christian Couder (1):
22211 bisect: print an error message when "git rev-list --bisect-vars" fails
22214 git-bisect.sh: don't accidentally override existing branch "bisect"
22215 Documentation/git-bundle.txt: fix synopsis
22216 commit --interactive: properly update the index before commiting
22218 Horst H. von Brand (1):
22219 Fix recipient santitization
22222 send-email: specify content-type of --compose body
22223 send-email: rfc2047-quote subject lines with non-ascii characters
22226 Revert "filter-branch: subdirectory filter needs --full-history"
22228 Junio C Hamano (3):
22229 Release Notes for 1.5.5.2
22230 show-branch --current: do not barf on detached HEAD
22234 gitweb: only display "next" links in logs if there is a next page
22236 Michele Ballabio (1):
22237 Documentation: fix graph in git-rev-parse.txt
22240 builtin-fast-export: Only output a single parent per line
22243 Version v1.5.5.2; changes since v1.5.5.1:
22244 -----------------------------------------
22246 A Large Angry SCM (1):
22247 git-repack: re-enable parsing of -n command line option
22250 Use "=" instead of "==" in condition as it is more portable
22251 Fix use after free() in builtin-fetch
22254 post-receive-email: fix accidental removal of a trailing space in signature line
22257 copy.c: copy_fd - correctly report write errors
22258 archive.c: format_subst - fixed bogus argument to memchr
22261 git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc
22264 Remove 'header' from --signoff option description
22266 Dmitry Potapov (1):
22267 git-gc --prune is deprecated
22269 Dustin Sallings (1):
22270 Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
22272 Florian Ragwitz (1):
22273 filter-branch: Documentation fix.
22276 diff-options.txt: document the new "--dirstat" option
22279 Add missing "short" alternative to --date in rev-list-options.txt
22282 Documentation/git-describe.txt: make description more readable
22285 Don't force imap.host to be set when imap.tunnel is set
22286 t5516: remove ambiguity test (1)
22287 doc/git-gc: add a note about what is collected
22288 push: allow unqualified dest refspecs to DWIM
22289 remote: create fetch config lines with '+'
22290 fix reflog approxidate parsing bug
22291 cvsimport: always pass user data to "system" as a list
22292 checkout: don't rfc2047-encode oneline on detached HEAD
22293 doc: clarify definition of "update" for git-add -u
22294 doc/git-daemon: s/uploadarchive/uploadarch/
22295 git-am: fix typo in usage message
22298 wt-status.h: declare global variables as extern
22299 rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
22302 git-filter-branch: Clarify file removal example.
22303 git-show.txt: Not very stubby these days.
22305 Junio C Hamano (3):
22306 write-tree: properly detect failure to write tree objects
22307 clone: detect and fail on excess parameters
22308 fetch-pack: brown paper bag fix
22310 Linus Torvalds (1):
22311 fetch-pack: do not stop traversing an already parsed commit
22314 Linked glossary from cvs-migration page
22316 Matthew Ogilvie (1):
22317 gitattributes: Fix subdirectory attributes specified from root directory
22320 svn-git: Use binmode for reading/writing binary rev maps
22323 diff options documentation: refer to --diff-filter in --name-status
22326 Amend git-push refspec documentation
22328 Shawn O. Pearce (1):
22329 Clarify repack -n documentation
22331 Sitaram Chamarty (1):
22332 builtin-commit.c: add -u as short name for --untracked-files
22335 bash: Add completion for git diff --base --ours --theirs
22337 Thomas Guyot-Sionnest (1):
22338 git-svn bug with blank commits and author file
22340 martin f. krafft (2):
22341 Escape project name in regexp
22342 Escape project names before creating pathinfo URLs
22345 Version v1.5.5.1; changes since v1.5.5:
22346 ---------------------------------------
22348 Alberto Bertogli (1):
22349 builtin-apply: Show a more descriptive error on failure when opening a patch
22351 Björn Steinbrink (1):
22352 Fix section about backdating tags in the git-tag docs
22355 Fix documentation syntax of optional arguments in short options.
22356 core-tutorial.txt: Fix showing the current behaviour.
22358 Christian Couder (4):
22359 bisect: fix bad rev checking in "git bisect good"
22360 bisect: report bad rev better
22361 bisect: squelch "fatal: ref HEAD not a symref" misleading message
22362 git-bisect: make "start", "good" and "skip" succeed or fail atomically
22364 Clifford Caoile (1):
22365 Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
22367 Daniel Barkalow (1):
22368 Fix config key miscount in url.*.insteadOf
22370 Dirk Süsserott (1):
22371 Documentation/git-request-pull: Fixed a typo ("send" -> "end")
22373 Jakub Narębski (1):
22374 gitweb: Fix 'history' view for deleted files with history
22377 git-fetch: fix status output when not storing tracking ref
22380 Document option --only of git commit
22383 Clarify and fix English in "git-rm" documentation
22386 git-remote: reject adding remotes with invalid names
22388 Junio C Hamano (7):
22389 Document -w option to shortlog
22390 Documentation/git-submodule: typofix
22391 t7401: squelch garbage output
22392 rebase: do not munge commit log message
22393 git-am: minor cleanup
22394 am: POSIX portability fix
22397 Linus Torvalds (2):
22398 Ignore leading empty lines while summarizing merges
22399 git-am: cope better with an empty Subject: line
22402 git-submodule - possibly use branch name to describe a module
22405 Document that WebDAV doesn't need git on the server, and works over SSL
22407 Michele Ballabio (1):
22408 revision.c: make --date-order overriddable
22411 Force the medium pretty format on calls to git log
22414 git-submodule: Avoid 'fatal: cannot describe' message
22417 git-archive: ignore prefix when checking file attribute
22420 Clarify documentation of git-cvsserver, particularly in relation to git-shell
22423 git clean: Don't automatically remove directories when run within subdirectory
22424 git clean: Add test to verify directories aren't removed with a prefix
22427 Version v1.5.5; changes since v1.5.5-rc3:
22428 -----------------------------------------
22430 Christian Couder (2):
22431 git-gui: Update french translation
22432 test suite: remove useless TERM cruft in "t7005-editor.sh"
22435 git-svn: fix following renamed paths when tracking a single path
22438 gitk: Fix changing colors through Edit->Preferences
22440 Jakub Narębski (1):
22441 Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output"
22443 Junio C Hamano (2):
22444 Fix "git apply" to correctly enforce "match at the beginning"
22448 git-fetch: Don't trigger a bus error when given the refspec "tag"
22450 Michele Ballabio (1):
22451 git-gui: use +/- instead of ]/[ to show more/less context in diff
22454 Add interactive option in rebase command completion list.
22455 Add prefix oriented completions for diff and format-patch commands.
22458 git-pack-objects.txt: Make wording slightly less ambiguous
22459 Add description of OFS_DELTA to the pack format description
22461 Shawn O. Pearce (1):
22462 git-gui: Switch keybindings for [ and ] to bracketleft and bracketright
22465 Version v1.5.5-rc3; changes since v1.5.5-rc2:
22466 ---------------------------------------------
22469 mktag.c: improve verification of tagger field and tests
22470 mktag.c: tweak validation of tagger field and adjust test script
22473 Silence cpio's "N blocks" output when cloning locally
22475 Christian Couder (1):
22476 help: Add a missing OPT_END().
22478 Damien Diederen (7):
22479 cvsserver: Respond to the 'editors' and 'watchers' commands
22480 cvsserver: Only print the file part of the filename in status header
22481 cvsserver: Do not include status output for subdirectories if -l is passed
22482 cvsserver: Add a few tests for 'status' command
22483 cvsserver: Implement update -p (print to stdout)
22484 cvsserver: Add test for update -p
22485 cvsserver: Use the user part of the email in log and annotate results
22488 git-svn: remove redundant slashes from show-ignore
22491 filter-branch: Test renaming directories in a tree-filter
22492 verify-tag: Clean up the temporary file if gpg cannot be started.
22493 t7004-tag: Skip more tests if gpg is not available.
22495 Jonathan del Strother (1):
22496 git-gui: Add shortcut keys for Show More/Less Context
22499 Allow git-cvsserver database table name prefix to be specified.
22501 Junio C Hamano (5):
22502 Add corner case tests for diff-index and diff-files
22503 diff-index: careful when inspecting work tree items
22504 diff-files: careful when inspecting work tree items
22505 Accept git aliases outside a git repository
22508 Marius Storm-Olsen (1):
22509 git-p4: Handle Windows EOLs properly after removal of p4 submit template handling.
22512 git-cvsserver: handle change type T
22514 Shawn O. Pearce (1):
22518 Describe the bug in handling filenames with funny characters in 'git add -i'
22520 veillette@yahoo.ca (1):
22521 filter-branch: Fix renaming a directory in the tree-filter
22524 Version v1.5.5-rc2; changes since v1.5.5-rc1:
22525 ---------------------------------------------
22528 t/t3800-mktag.sh: use test_must_fail rather than '!'
22530 Daniel Barkalow (2):
22531 Tighten refspec processing
22532 Fix branches file configuration
22534 Dirk Süsserott (1):
22535 Documentation: git-tag '-m'/'-F' implies '-a'
22537 Frank Lichtenheld (1):
22538 t9600-cvsimport.sh: set HOME before checking for cvsps availability
22541 imap-send: properly error out if imap.host is not set in config
22544 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
22545 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
22548 Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
22550 Johannes Schindelin (2):
22551 RelNotes: mention checkout/branch's --track option, too
22552 init: show "Reinit" message even in an (existing) empty repository
22555 builtin-remote: Fix missing newline at end of listing of pushed branches
22557 Julian Phillips (1):
22558 Documentation/git-checkout: Update summary to reflect current abilities
22560 Junio C Hamano (7):
22561 refspec: allow colon-less wildcard "refs/category/*"
22562 git-fetch test: test tracking fetch results, not just FETCH_HEAD
22563 test_must_fail: 129 is a valid error code from usage()
22564 Update draft release notes for 1.5.4.5
22565 Update draft release notes for 1.5.5
22566 builtin-prune: protect objects listed on the command line
22569 Michele Ballabio (3):
22570 parse-options.c: introduce OPT_DATE
22571 Add tests for git-prune
22572 builtin-prune.c: use parse_options()
22575 Always set *nongit_ok in setup_git_directory_gently()
22578 Version v1.5.5-rc1; changes since v1.5.5-rc0:
22579 ---------------------------------------------
22582 builtin-gc.c: allow disabling all auto-gc'ing by assigning 0 to gc.auto
22583 t/t7003-filter-branch.sh: use test_must_fail rather than '!'
22585 Daniel Barkalow (3):
22586 Tighten refspec processing
22590 Eyvind Bernhardsen (2):
22591 fast-import: Allow "reset" to delete a new branch without error
22592 fast-import: Document the effect of "merge" with no "from" in a commit
22594 Johannes Schindelin (1):
22595 remote show: do not show symbolic refs
22597 Junio C Hamano (10):
22598 Makefile: DIFF_OBJS is not special at all these days
22599 Makefile: flatten enumeration of headers, objects and programs
22600 t1000: use "test_must_fail git frotz", not "! git frotz"
22601 git-merge-one-file: fix longstanding stupid thinko
22602 Test: catch if trash cannot be removed
22603 Add tests to catch problems with un-unlinkable symlinks
22604 Fix read-tree not to discard errors
22605 remote.c: Fix overtight refspec validation
22606 gc --auto: raise default auto pack limit from 20 to 50
22610 Add --reverse to the git-rev-list usage string
22611 Document the sendemail.smtpserverport config variable
22612 Don't try and percent-escape existing percent escapes in git-svn URIs
22613 Make git-svn tests behave better on OS X
22615 Linus Torvalds (3):
22616 Don't update unchanged merge entries
22617 Fix possible Solaris problem in 'checkout_entry()'
22618 Make revision limiting more robust against occasional bad commit dates
22620 Marius Storm-Olsen (1):
22621 git-p4: Optimize the fetching of data from perforce.
22624 Documentation/git-merge: document subtree strategy.
22627 make it easier for people who just want to get rid of 'git gc --auto'
22629 Ralf Wildenhues (1):
22630 Improve description of git filter-branch.
22633 git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
22634 git-p4: Use P4EDITOR environment variable when set
22637 Version v1.5.5-rc0; changes since v1.5.4.7:
22638 -------------------------------------------
22640 Adam Piątyszek (1):
22641 git-gui: Add option for changing the width of the commit message text box
22644 Fix builtin checkout crashing when given an invalid path
22645 Fix test for cleanup failure in t7300 on Windows
22646 Do not use GUID on dir in git init --shared=all on FreeBSD
22647 git-gui: update russian translation
22649 Alexandre Julliard (5):
22650 git.el: Support for showing unknown/ignored directories.
22651 git.el: Added a command to amend a commit.
22652 git.el: Check for existing buffers on revert.
22653 git.el: Better handling of subprocess errors.
22654 git.el: Do not display empty directories.
22656 Andreas Ericsson (1):
22657 pack-objects: Add runtime detection of online CPU's
22659 Brandon Casey (13):
22660 builtin-reflog.c: fix typo that accesses an unset variable
22661 Add compat/fopen.c which returns NULL on attempt to open directory
22662 builtin-reflog.c: don't install new reflog on write failure
22663 reflog-delete: parse standard reflog options
22664 git-reflog: add option --rewrite to update reflog entries while expiring
22665 refs.c: make close_ref() and commit_ref() non-static
22666 git-reflog: add option --updateref to write the last reflog sha1 into the ref
22667 git-stash: add new 'drop' subcommand
22668 git-stash: add new 'pop' subcommand
22669 pack-objects: Print a message describing the number of threads for packing
22670 t3903-stash.sh: Add missing '&&' to body of testcase
22671 git-reflog.txt: Document new commands --updateref and --rewrite
22672 t3903-stash.sh: Add tests for new stash commands drop and pop
22675 compat: Add simplified merge sort implementation from glibc
22678 gitweb: Make use of the $git_dir variable at sub git_get_project_url_list
22679 gitweb: Use the config file to set repository owner's name.
22682 Eliminate confusing "won't bisect on seeked tree" failure
22685 Make builtin-reset.c use parse_options.
22687 Charles Bailey (6):
22688 Tidy up git mergetool's backup file behaviour
22689 Changed an internal variable of mergetool to support custom commands
22690 Teach git mergetool to use custom commands defined at config time
22691 Add a very basic test script for git mergetool
22692 git-mergetool documentaiton: show toolnames in typewriter font
22693 merge-tool documentation: describe custom command usage
22696 cleanup: remove unused git_checkout_config
22697 whatchanged documentation: share description of --pretty with others
22698 specify explicit "--pretty=medium" with `git log/show/whatchanged`
22699 log/show/whatchanged: introduce format.pretty configuration
22701 Christian Couder (17):
22702 help: make 'git-help--browse' usable outside 'git-help'.
22703 help--browse: add '--config' option to check a config option for a browser.
22704 Rename 'git-help--browse.sh' to 'git-web--browse.sh'.
22705 instaweb: use 'git-web--browse' to launch browser.
22706 config: add test cases for empty value and no value config variables.
22707 Documentation: instaweb: add 'git-web--browse' information.
22708 web--browse: Add a few quotes in 'init_browser_path'.
22709 Documentation: add 'git-web--browse.txt' and simplify other docs.
22710 help.c: use 'git_config_string' to get 'help_default_format'.
22711 run-command: Redirect stderr to a pipe before redirecting stdout to stderr
22712 help: add "man.viewer" config var to use "woman" or "konqueror"
22713 Documentation: help: describe 'man.viewer' config variable
22714 help: implement multi-valued "man.viewer" config option
22715 Documentation: help: explain 'man.viewer' multiple values
22716 help: warn if specified 'man.viewer' is unsupported, instead of erroring out
22717 web--browse: use custom commands defined at config time
22718 Documention: web--browse: add info about "browser.<tool>.cmd" config var
22720 Christian Stimming (4):
22721 git-gui: (i18n) Fix a bunch of still untranslated strings.
22722 git-gui: Update German translation.
22723 git-gui: (i18n) Add newly added translation strings to template.
22724 git-gui: Update German translation.
22726 Clemens Buchacher (2):
22727 http-push: push <remote> :<branch> deletes remote branch
22728 http-push: add regression tests
22730 Daniel Barkalow (33):
22731 Test :/string form for checkout
22732 Reduce the number of connects when fetching
22733 Allow callers of unpack_trees() to handle failure
22734 Add flag to make unpack_trees() not print errors.
22735 Send unpack-trees debugging output to stderr
22736 Discard "deleted" cache entries after using them to update the working tree
22737 Add "skip_unmerged" option to unpack_trees.
22738 Build-in merge-recursive
22739 Move create_branch into a library file
22740 Use diff -u instead of diff in t7201
22741 Library function to check for unmerged index entries
22742 Move code to clean up after a branch change to branch.c
22744 Clean up reporting differences on branch switch
22745 API documentation for remote.h
22746 Add more tests for format-patch
22747 Improve message-id generation flow control for format-patch
22748 Export some email and pretty-printing functions
22749 Use ALLOC_GROW in remote.{c,h}
22750 Add a --cover-letter option to format-patch
22751 Add tests for extra headers in format-patch
22752 Fix format.headers not ending with a newline
22753 Combine To: and Cc: headers
22754 Support a --cc=<email> option in format-patch
22755 Resolve value supplied for no-colon push refspecs
22756 builtin-checkout.c: Remove unused prefix arguments in switch_branches path
22757 Add support for url aliases in config files
22758 Add API access to shortlog
22759 Improve collection of information for format-patch --cover-letter
22760 Always use the current connection's remote ref list in git protocol
22761 Use diff_tree() directly in making cover letter
22762 Write index file on any checkout of files
22763 Write diff output to a file in struct diff_options
22766 gitk: Don't show local changes when we there is no work tree
22769 git-send-email: Generalize auto-cc recipient mechanism.
22772 git.el: Set process-environment instead of invoking env
22774 Dmitry Potapov (3):
22775 git-web--browse: do not start the browser with nohup
22776 Make private quote_path() in wt-status.c available as quote_path_relative()
22777 git-clean: correct printing relative path
22780 git-svn: improve repository URL matching when following parents
22782 Florian La Roche (1):
22783 gitweb: Make feed entries point to commitdiff view
22785 Frank Lichtenheld (1):
22786 gc: Add --quiet option
22789 gitk: properly deal with tag names containing / (slash)
22790 git-merge-index documentation: clarify synopsis
22791 builtin-tag.c: remove cruft
22792 hash-object: cleanup handling of command line options
22794 Jakub Narębski (11):
22795 gitweb: Fix displaying unchopped argument in chop_and_escape_str
22796 gitweb: Add new option -nohtml to quot_xxx subroutines
22797 gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
22798 gitweb: Fix bugs in git_search_grep_body: it's length(), not len()
22799 gitweb: Better cutting matched string and its context
22800 Add '--fixed-strings' option to "git log --grep" and friends
22801 gitweb: Change parse_commits signature to allow for multiple options
22802 gitweb: Simplify fixed string search
22803 Documentation: Remove --{min,max}-age option from git-log(1)
22804 gitweb: Mark first match when searching commit messages
22805 gitweb: Fix and simplify pickaxe search
22808 Add a BuildRequires for gettext in the spec file.
22810 Jason McMullan (1):
22811 Remove $Id: ..$ $Header: ..$ etc from +ko and +k files during import
22814 git-web--browse: fix misplaced quote in init_browser_path()
22815 git-help--browse: improve browser support under OS X
22816 builtin-checkout.c: fix possible usage segfault
22817 branch: optionally setup branch.*.merge from upstream local branches
22818 doc: documentation update for the branch track changes
22819 Correct git-pull documentation
22820 send-email: fix In-Reply-To regression
22821 pull: pass --strategy along to to rebase
22823 Jean-Luc Herren (1):
22824 fast-import: exit with proper message if not a git dir
22827 allow suppressing of global and system config
22828 fix config reading in tests
22829 hard-code the empty tree object
22830 add--interactive: handle initial commit better
22831 git_config_*: don't assume we are parsing a config file
22832 t3404: use configured shell instead of /bin/sh
22833 diff: fix java funcname pattern for solaris
22834 t9001: enhance fake sendmail test harness
22835 send-email: test compose functionality
22837 make alias lookup a public, procedural function
22838 help: respect aliases
22839 use build-time SHELL_PATH in test scripts
22840 rename: warn user when we have turned off rename detection
22841 allow git-am to run in a subdirectory
22842 Add a test for read-tree -u --reset with a D/F conflict
22843 gitk: make autoselect optional
22844 tr portability fixes
22845 t0050: perl portability fix
22846 more tr portability test script fixes
22847 grep portability fix: don't use "-e" or "-q"
22848 remove use of "tail -n 1" and "tail -1"
22849 add test_cmp function for test scripts
22850 t4020: don't use grep -a
22851 t6000lib: tr portability fix
22852 add NO_EXTERNAL_GREP build option
22853 filter-branch: don't use xargs -0
22854 filter-branch: use $SHELL_PATH instead of 'sh'
22855 t9112: add missing #!/bin/sh header
22856 t7505: use SHELL_PATH in hook
22857 t6000lib: re-fix tr portability
22860 Avoid unnecessary "if-before-free" tests.
22863 Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR
22864 Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
22866 Johannes Schindelin (21):
22867 Teach "git reflog" a subcommand to delete single entries
22868 Also use unpack_trees() in do_diff_cache()
22869 Fix "git clone" for git:// protocol
22870 Adjust .gitignore for 5884f1(Rename 'git-help--browse.sh'...)
22871 Introduce the config variable pack.packSizeLimit
22872 bisect view: check for MinGW32 and MacOSX in addition to X11
22873 xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
22874 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
22875 completion: support format-patch's --cover-letter option
22876 path-list: add functions to work with unsorted lists
22877 parseopt: add flag to stop on first non option
22878 Test "git remote show" and "git remote prune"
22879 Make git-remote a builtin
22880 builtin-remote: prune remotes correctly that were added with --mirror
22881 Fix make_absolute_path() for parameters without a slash
22882 format-patch: use the diff options for the cover letter, too
22883 format-patch: wrap cover-letter's shortlog sensibly
22884 remote show: Clean up connection correctly if object fetch wasn't done
22885 remote: fix "update [group...]"
22886 builtin remote rm: remove symbolic refs, too
22887 gc: call "prune --expire 2.weeks.ago" by default
22890 Fix misuse of prefix_path()
22891 gitk: Heed the lines of context in merge commits
22892 Technical documentation of the run-command API.
22893 prefix_path: use is_absolute_path() instead of *orig == '/'
22894 start_command(), .in/.out/.err = -1: Callers must close the file descriptor
22895 start_command(), if .in/.out > 0, closes file descriptors, not the callers
22896 git-submodule summary: fix that some "wc" flavors produce leading spaces
22899 man pages are littered with .ft C and others
22900 shortlog: do not require to run from inside a git repository
22902 Junichi Uekawa (1):
22903 git-blame.el: show the when, who and what in the minibuffer.
22905 Junio C Hamano (93):
22906 index: be careful when handling long names
22907 Avoid running lstat(2) on the same cache entry.
22908 read-cache.c: fix a couple more CE_REMOVE conversion
22909 read-cache.c: introduce is_racy_timestamp() helper
22911 Sane use of test_expect_failure
22912 test: reword the final message of tests with known breakages
22913 known breakage: revision range computation with clock skew
22914 fix misuse of prefix_path()
22915 builtin-apply.c: refactor small part that matches context
22916 builtin-apply.c: restructure "offset" matching
22917 builtin-apply.c: push match-beginning/end logic down
22918 builtin-apply.c: make it more line oriented
22919 builtin-apply.c: optimize match_beginning/end processing a bit.
22920 builtin-apply.c: mark common context lines in lineinfo structure.
22921 builtin-apply.c: clean-up apply_one_fragment()
22922 builtin-apply.c: simplify calling site to apply_line()
22923 builtin-apply.c: do not feed copy_wsfix() leading '+'
22924 builtin-apply.c: move copy_wsfix() function a bit higher.
22925 builtin-apply.c: pass ws_rule down to match_fragment()
22926 git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run
22927 core.whitespace: cr-at-eol
22928 Documentation/SubmittingPatches: Instruct how to use [PATCH] Subject header
22929 Documentation/SubmittingPatches: discuss first then submit
22930 Documentation/SubmittingPatches: What's Acked-by and Tested-by?
22931 Make error messages from cherry-pick/revert more sensible
22932 setup: sanitize absolute and funny paths in get_pathspec()
22933 git-add: adjust to the get_pathspec() changes.
22934 builtin-mv: minimum fix to avoid losing files
22935 gitignore(5): Allow "foo/" in ignore list to match directory "foo"
22936 gitignore: lazily find dtype
22937 Define the project whitespace policy
22938 apply: do not barf on patch with too large an offset
22939 Update the main documentation (stale notes section)
22940 .mailmap: adjust to a recent patch application glitch.
22941 diff --relative: output paths as relative to the current subdirectory
22942 diff --relative: help working in a bare repository
22943 checkout: notice when the switched branch is behind or forked
22944 Documentation/SubmittingPatches - a suggested patch flow
22945 Sync with 1.5.4.2 and start 1.5.5 Release Notes
22946 sending errors to stdout under $PAGER
22947 merge-recursive: split low-level merge functions out.
22948 expose a helper function peel_to_type().
22949 checkout: tone down the "forked status" diagnostic messages
22950 checkout: work from a subdirectory
22951 git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()
22952 checkout: updates to tracking report
22953 gitweb: Better chopping in commit search results
22954 Add merge-subtree back
22955 checkout: show progress when checkout takes long time while switching branches
22956 ws_fix_copy(): move the whitespace fixing function to ws.c
22957 checkout: error out when index is unmerged even with -m
22958 diff --dirstat: saner handling of binary and unmerged files
22959 url rewriting: take longest and first match
22960 git-apply --whitespace=fix: fix off by one thinko
22961 Revert "pack-objects: Print a message describing the number of threads for packing"
22962 git-remote: do not complain on multiple URLs for a remote
22963 format-patch: remove a leftover debugging message
22964 tests: introduce test_must_fail
22965 Update draft release notes for 1.5.5
22966 t6024: move "git reset" to prepare for a test inside the test itself
22967 CodingGuidelines: spell out how we use grep in our scripts
22968 find_unique_abbrev(): redefine semantics
22969 Clean up find_unique_abbrev() callers
22970 diff-lib.c: constness strengthening
22971 diff: make sure work tree side is shown as 0{40} when different
22972 Update draft release notes for 1.5.5
22973 describe --always: fall back to showing an abbreviated object name
22974 git-describe: use tags found in packed-refs correctly
22975 describe: fix --long output
22976 describe: re-fix display_name()
22977 t6120 (describe): check --long properly
22978 Revert "receive-pack: use strict mode for unpacking objects"
22979 Revert "unpack-objects: prevent writing of inconsistent objects"
22980 fsck.c: fix bogus "empty tree" check
22981 am: read from the right mailbox when started from a subdirectory
22982 am: remove support for -d .dotest
22984 get_pathspec(): die when an out-of-tree path is given
22985 Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files)
22986 Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes)
22987 Revert part of d089eba (setup: sanitize absolute and funny paths in get_pathspec())
22988 git-clean: add tests for relative path
22989 send-email: --no-signed-off-cc should suppress 'sob' cc
22990 traverse_trees_recursive(): propagate merge errors up
22991 git-gui: Simplify MSGFMT setting in Makefile
22992 Documentation/config: typofix
22993 Documentation/git-help: typofix
22994 read-tree() and unpack_trees(): use consistent limit
22995 Redo "add test_cmp function for test scripts"
22996 git-gui: Improve directions regarding POT update in po/README
22997 Resurrect git-rerere to contrib/examples
22998 Update draft release notes for 1.5.5
23000 Karl Hasselström (2):
23001 git-svn: Don't call git-repack anymore
23002 Let "git svn" run "git gc --auto" occasionally
23005 bash: Properly quote the GIT_DIR at all times to fix subdirectory paths with spaces
23007 Kristian Høgsberg (1):
23008 wt-status.c: no need for dup() dance anymore
23011 Simplify setup of $GIT_DIR in git-sh-setup.sh
23013 Linus Torvalds (22):
23014 Make on-disk index representation separate from in-core one
23015 Make run_diff_index() use unpack_trees(), not read_tree()
23016 Create pathname-based hash-table lookup into index
23017 Add "--dirstat" for some directory statistics
23018 gitk: learn --show-all output
23019 Add "--show-all" revision walker flag for debugging
23020 Fix name re-hashing semantics
23021 Name hash fixups: export (and rename) remove_hash_entry
23022 Use helper function for copying index entry information
23023 Be more verbose when checkout takes a long time
23024 Add 'df_name_compare()' helper function
23025 Make 'traverse_tree()' use linked structure rather than 'const char *base'
23026 Add return value to 'traverse_tree()' callback
23027 Make 'traverse_trees()' traverse conflicting DF entries in parallel
23028 Move 'unpack_trees()' over to 'traverse_trees()' interface
23029 Fix tree-walking compare_entry() in the presense of --prefix
23030 Add 'const' where appropriate to index handling functions
23031 Make 'unpack_trees()' take the index to work on as an argument
23032 Make 'unpack_trees()' have a separate source and destination index
23033 unpack_trees(): minor memory leak fix in unused destination index
23034 unpack_trees(): fix diff-index regression.
23035 Fix recent 'unpack_trees()'-related changes breaking 'git stash'
23037 Marco Costalba (1):
23038 Avoid a useless prefix lookup in strbuf_expand()
23041 git-submodule - Allow adding a submodule in-place
23043 Martin Koegler (28):
23044 git-fsck: report missing author/commit line in a commit as an error
23045 parse_object_buffer: don't ignore errors from the object specific parsing functions
23046 deref_tag: handle return value NULL
23047 deref_tag: handle tag->tagged = NULL
23048 check return code of prepare_revision_walk
23049 read_object_with_reference: don't read beyond the buffer
23050 get_sha1_oneline: check return value of parse_object
23051 mark_blob/tree_uninteresting: check for NULL
23052 reachable.c::add_one_tree: handle NULL from lookup_tree
23053 list-objects.c::process_tree/blob: check for NULL
23054 check results of parse_commit in merge_bases
23055 process_tag: handle tag->tagged == NULL
23056 reachable.c::process_tree/blob: check for NULL
23057 revision.c: handle tag->tagged == NULL
23058 parse_commit: don't fail, if object is NULL
23059 check return value from parse_commit() in various functions
23060 peel_onion: handle NULL
23061 add generic, type aware object chain walker
23062 builtin-fsck: move away from object-refs to fsck_walk
23063 Remove unused object-ref code
23064 builtin-fsck: reports missing parent commits
23065 builtin-fsck: move common object checking code to fsck.c
23066 add common fsck error printing function
23067 unpack-object: cache for non written objects
23068 unpack-objects: prevent writing of inconsistent objects
23069 index-pack: introduce checking mode
23070 receive-pack: use strict mode for unpacking objects
23071 fetch-pack: check parse_commit/object results
23073 Matthias Kestenholz (1):
23074 Add color.ui variable which globally enables colorization if set
23076 Michael Witten (3):
23077 git-send-email: ssh/login style password requests
23078 git-send-email: SIG{TERM,INT} handlers
23079 git-send-email: Better handling of EOF
23082 Add compat/snprintf.c for systems that return bogus
23083 autoconf: Test FREAD_READS_DIRECTORIES
23085 Michele Ballabio (7):
23086 gitk: Fix "Key bindings" message
23087 git-gui: fix typo in lib/spellcheck.tcl
23088 builtin-for-each-ref.c: fix typo in error message
23089 gitk: Mark another string for translation
23090 git-gui: update Italian translation
23091 gitk: initial Italian translation
23092 git-gui: remove spurious "fuzzy" attributes in po/it.po
23095 Work around curl-gnutls not liking to be reinitialized
23096 Add test for git rebase --abort
23097 Documentation/git-rebase.txt: Add --strategy to synopsys
23098 git rebase --abort: always restore the right commit
23099 t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge
23102 git-clean: handle errors if removing files fails
23103 Improve t6029 to check the real "subtree" case
23104 Update Hungarian translation. 100% completed.
23105 git-gui: Updated Hungarian translation (e5fba18)
23107 Nanako Shiraishi (2):
23108 git-gui: Update Japanese translation
23109 git-gui: Update Japanese translation
23112 factorize revindex code out of builtin-pack-objects.c
23113 make verify_one_pack() a bit less wrong wrt packed_git structure
23114 fix unimplemented packed_object_info_detail() features
23115 add storage size output to 'git verify-pack -v'
23116 pack-objects: proper pack time stamping with --max-pack-size
23119 git-commit: support variable number of hook arguments
23120 git-commit: set GIT_EDITOR=: if editor will not be launched
23121 git-commit: Refactor creation of log message.
23122 git-commit: add a prepare-commit-msg hook
23124 Paul Mackerras (3):
23125 gitk: Only restore window size from ~/.gitk, not position
23126 gitk: Avoid Tcl error when switching views
23127 gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d
23129 Pekka Kaitaniemi (1):
23130 gitk: Add horizontal scrollbar to the diff view
23132 Peter Krefting (2):
23133 git-gui: Regenerated po template and merged translations with it
23134 git-gui: updated Swedish translation
23137 gitweb: Clearly distinguish regexp / exact match searches
23139 Philipp A. Hartmann (1):
23140 git-gui: if a background colour is set, set foreground colour as well
23142 Philippe Bruhat (3):
23143 cvsimport: have default merge regex allow for dashes in the branch name
23144 cvsimport: allow for multiple -M options
23145 cvsimport: document that -M can be used multiple times
23147 Pierre Habouzit (4):
23148 git-describe: Add a --match option to limit considered tags.
23149 git-name-rev: add a --(no-)undefined option.
23150 parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseopt
23151 parse-options: new option type to treat an option-like parameter as an argument.
23154 git-submodule summary: code framework
23155 git-submodule summary: show commit summary
23156 git-submodule summary: limit summary size
23157 git-submodule summary: documentation
23158 git-submodule summary: test
23160 Rafael Garcia-Suarez (1):
23161 Make git-remote.perl "use strict" compliant
23163 Ralf Wildenhues (1):
23166 Robin Rosenberg (2):
23167 Make blame accept absolute paths
23168 Improve bash prompt to detect various states like an unfinished merge
23171 bash: add git-branch options
23172 bash: git-branch -d and -m lists only local branches
23173 bash: remove unnecessary conditions when checking for subcommands
23174 bash: refactor searching for subcommands on the command line
23175 bash: add new 'git stash' subcommands
23176 bash: add 'git svn' subcommands and options
23177 bash: use __gitdir when completing 'git rebase' options
23178 bash: fix long option with argument double completion
23179 update 'git rebase' documentation
23181 Samuel Tardieu (1):
23182 "remote update": print remote name being fetched from
23185 git-bundle.txt: Add different strategies to create the bundle
23186 git-describe: --long shows the object name even for a tagged commit
23187 clone: support cloning full bundles
23189 Sebastian Noack (1):
23190 git-svn: Don't prompt for client cert password everytime.
23192 Shawn O. Pearce (37):
23193 git-gui: Automatically spell check commit messages as the user types
23194 git-gui: Paper bag fix bad string length call in spellchecker
23195 git-gui: Correct size of dictionary name widget in options dialog
23196 Include annotated tags in fast-import crash reports
23197 Include the fast-import marks table in crash reports
23198 Finish current packfile during fast-import crash handler
23199 Update fast-import documentation to discuss crash reports
23200 Teach git-grep --name-only as synonym for -l
23201 git-gui: Ensure all spellchecker 'class' variables are initialized
23202 git-gui: Remove explicit references to 'aspell' in message strings
23203 git-gui: Only bind the spellcheck popup suggestion hook once
23204 git-gui: Catch and display aspell startup failures to the user
23205 git-gui: Gracefully display non-aspell version errors to users
23206 git-gui: Shorten Aspell version strings to just Aspell version number
23207 Optimize peel_ref for the current ref of a for_each_ref callback
23208 Teach git-describe to use peeled ref information when scanning tags
23209 Avoid accessing non-tag refs in git-describe unless --all is requested
23210 Teach git-describe --exact-match to avoid expensive tag searches
23211 Use git-describe --exact-match in bash prompt on detached HEAD
23212 Teach git-describe to verify annotated tag names before output
23213 Remove unused variable in builtin-fetch find_non_local_tags
23214 Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch
23215 Ensure tail pointer gets setup correctly when we fetch HEAD only
23216 Allow builtin-fetch's find_non_local_tags to append onto a list
23217 Free the path_lists used to find non-local tags in git-fetch
23218 Teach upload-pack to log the received need lines to an fd
23219 Make git-fetch follow tags we already have objects for sooner
23220 Teach git-fetch to grab a tag at the same time as a commit
23221 Don't allow git-describe failures to go unnoticed in t6120
23222 Test for packed tags in git-describe output
23223 Add git-describe test for "verify annotated tag names on output"
23224 git-pack-objects: Automatically pack annotated tags if object was packed
23225 Teach fetch-pack/upload-pack about --include-tag
23226 Teach git-fetch to exploit server side automatic tag following
23227 bash: Remove completion of core.legacyheaders option
23228 git-gui: Don't translate the special Apple menu
23229 git-gui: Adjusted Japanese translation to updated POT
23231 Simon Hausmann (7):
23232 git-p4: Fix submit user-interface.
23233 git-p4: Ensure the working directory and the index are clean before "git-p4 rebase"
23234 git-p4: Remove --log-substitutions feature.
23235 git-p4: Clean up git-p4 submit's log message handling.
23236 git-p4: Removed git-p4 submit --direct.
23237 git-p4: git-p4 submit cleanups.
23238 git-p4: Fix import of changesets with file deletions
23240 Steffen Prohaska (4):
23241 safecrlf: Add mechanism to warn about irreversible crlf conversions
23242 gitk: Add checkbutton to ignore space changes
23243 t4014: Replace sed's non-standard 'Q' by standard 'q'
23244 Add tests for filesystem challenges (case and unicode normalization)
23247 bash: Add more long options to be completed with "git --<TAB>"
23250 Add `git svn blame' command
23253 git-p4: Fix indentation from tab to spaces
23256 git-p4: Fix an obvious typo
23257 git-p4: support exclude paths
23259 Tor Arvid Lund (1):
23260 git-p4: Support usage of perforce client spec
23262 Uwe Kleine-König (1):
23263 rev-list: add --branches, --tags and --remotes
23266 Add an --argscmd flag to get the list of refs to show
23269 git-gui: translate the remaining messages in zh_cn.po to chinese
23272 Version v1.5.4.7; changes since v1.5.4.6:
23273 -----------------------------------------
23275 Junio C Hamano (2):
23276 gitweb: do not run "git diff" that is Porcelain
23280 Version v1.5.4.6; changes since v1.5.4.5:
23281 -----------------------------------------
23283 A Large Angry SCM (1):
23284 git-repack: re-enable parsing of -n command line option
23286 Alberto Bertogli (1):
23287 builtin-apply: Show a more descriptive error on failure when opening a patch
23290 copy.c: copy_fd - correctly report write errors
23291 archive.c: format_subst - fixed bogus argument to memchr
23293 Björn Steinbrink (1):
23294 Fix section about backdating tags in the git-tag docs
23297 Fix documentation syntax of optional arguments in short options.
23298 core-tutorial.txt: Fix showing the current behaviour.
23300 Christian Couder (4):
23301 bisect: fix bad rev checking in "git bisect good"
23302 bisect: report bad rev better
23303 bisect: squelch "fatal: ref HEAD not a symref" misleading message
23304 git-bisect: make "start", "good" and "skip" succeed or fail atomically
23306 Clifford Caoile (1):
23307 Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
23310 Remove 'header' from --signoff option description
23312 Dirk Süsserott (1):
23313 Documentation/git-request-pull: Fixed a typo ("send" -> "end")
23315 Dustin Sallings (1):
23316 Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
23318 Florian Ragwitz (1):
23319 filter-branch: Documentation fix.
23322 Documentation/git-describe.txt: make description more readable
23325 t5516: remove ambiguity test (1)
23326 fix reflog approxidate parsing bug
23327 cvsimport: always pass user data to "system" as a list
23328 doc: clarify definition of "update" for git-add -u
23329 doc/git-daemon: s/uploadarchive/uploadarch/
23330 git-am: fix typo in usage message
23333 Document option --only of git commit
23334 wt-status.h: declare global variables as extern
23335 rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
23338 Clarify and fix English in "git-rm" documentation
23340 Junio C Hamano (7):
23341 Fix "git apply" to correctly enforce "match at the beginning"
23342 Document -w option to shortlog
23343 git-am: minor cleanup
23344 am: POSIX portability fix
23345 write-tree: properly detect failure to write tree objects
23346 git-shell: accept "git foo" form
23349 Linus Torvalds (2):
23350 Ignore leading empty lines while summarizing merges
23351 git-am: cope better with an empty Subject: line
23354 Linked glossary from cvs-migration page
23356 Matthew Ogilvie (1):
23357 gitattributes: Fix subdirectory attributes specified from root directory
23360 svn-git: Use binmode for reading/writing binary rev maps
23362 Michele Ballabio (1):
23363 revision.c: make --date-order overriddable
23366 diff options documentation: refer to --diff-filter in --name-status
23369 builtin-fast-export: Only output a single parent per line
23372 git-archive: ignore prefix when checking file attribute
23375 Clarify documentation of git-cvsserver, particularly in relation to git-shell
23377 Sitaram Chamarty (1):
23378 builtin-commit.c: add -u as short name for --untracked-files
23380 Thomas Guyot-Sionnest (1):
23381 git-svn bug with blank commits and author file
23384 Version v1.5.4.5; changes since v1.5.4.4:
23385 -----------------------------------------
23387 Andy Whitcroft (1):
23388 shortlog: take the first populated line of the description
23391 git-new-workdir: Share SVN meta data between work dirs and the repository
23394 t/t3800-mktag.sh: use test_must_fail rather than '!'
23396 Clemens Buchacher (1):
23397 merge-recursive: handle file mode changes
23399 Daniel Barkalow (2):
23400 Tighten refspec processing
23401 Fix branches file configuration
23404 git-svn: don't blindly append '*' to branch/tags config
23407 Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.
23409 Jakub Narębski (1):
23410 gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
23413 t0021: tr portability fix for Solaris
23414 Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
23416 Johannes Schindelin (3):
23417 launch_editor(): allow spaces in the filename
23418 git fetch: Take '-n' to mean '--no-tags'
23419 merge-file: handle empty files gracefully
23422 Make man page building quiet when DOCBOOK_XSL_172 is defined
23424 Junio C Hamano (9):
23425 filter-branch: handle "disappearing tree" case correctly in subdir filter
23426 git-pull documentation: warn about the option order
23427 quiltimport: fix misquoting of parsed -p<num> parameter
23428 format-patch: generate MIME header as needed even when there is format.header
23429 rebase -m: do not trigger pre-commit verification
23430 Start draft ReleaseNotes for 1.5.4.5
23431 git-fetch test: test tracking fetch results, not just FETCH_HEAD
23432 Update draft release notes for 1.5.4.5
23435 Linus Torvalds (1):
23436 rev-parse: fix meaning of rev~ vs rev~0.
23438 Marc-André Lureau (2):
23439 git-svn: fix find-rev error message when missing arg
23440 git-cvsimport: fix merging with remote parent branch
23443 git rebase --abort: always restore the right commit
23445 Pierre Habouzit (1):
23446 git-quiltimport: better parser to grok "enhanced" series files.
23449 Minor wording changes in the keyboard descriptions in git-add --interactive.
23452 Version v1.5.4.4; changes since v1.5.4.3:
23453 -----------------------------------------
23456 Really make the LF after reset in fast-import optional
23458 Björn Steinbrink (1):
23459 receive-pack: Initialize PATH to include exec-dir.
23462 builtin-reflog.c: don't install new reflog on write failure
23465 Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest
23467 Caio Marcelo de Oliveira Filho (1):
23468 filter-branch documentation: non-zero exit status in command abort the filter
23471 Eliminate confusing "won't bisect on seeked tree" failure
23473 Daniel Barkalow (3):
23474 Use a single implementation and API for copy_file()
23475 Don't use GIT_CONFIG in t5505-remote
23476 Correct name of diff_flush() in API documentation
23479 templates/Makefile: don't depend on local umask setting
23480 git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
23483 rev-parse: fix potential bus error with --parseopt option spec handling
23484 send-email: fix In-Reply-To regression
23487 revert: actually check for a dirty index
23490 Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR
23491 Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
23493 Johannes Schindelin (4):
23494 http-push: avoid invalid memory accesses
23495 http-push: do not get confused by submodules
23496 http-push: avoid a needless goto
23497 cvsexportcommit: be graceful when "cvs status" reorders the arguments
23500 daemon: send more error messages to the syslog
23501 daemon: ensure that base-path is an existing directory
23504 Fix dcommit, rebase when rewriteRoot is in use
23506 Jonathan del Strother (1):
23507 Prompt to continue when editing during rebase --interactive
23509 Junio C Hamano (6):
23510 Fix "git log --merge --left-right"
23511 Start preparing for 1.5.4.4
23512 tests: introduce test_must_fail
23513 Update draft release notes for 1.5.4.4
23514 test-lib: fix TERM to dumb for test repeatability
23518 Fix incorrect wording in git-merge.txt.
23521 Set proxy override with http_init()
23522 Fix random crashes in http_cleanup()
23525 Documentation cherry-pick: Fix cut-and-paste error
23528 Documentation/git-filter-branch: add a new msg-filter example
23529 Documentation/git svn log: add a note about timezones.
23531 Pierre Habouzit (1):
23532 unquote_c_style: fix off-by-one.
23535 git-submodule: Fix typo 'url' which should be '$url'
23538 git.el: find the git-status buffer whatever its name is
23541 ident.c: reword error message when the user name cannot be determined
23543 Sebastian Noack (1):
23544 git-svn: Don't prompt for client cert password everytime.
23546 Shawn O. Pearce (6):
23547 Ensure 'make dist' compiles git-archive.exe on Cygwin
23548 Protect peel_ref fallback case from NULL parse_object result
23549 Correct fast-export file mode strings to match fast-import standard
23550 git-gui: Paper bag fix info dialog when no files are staged at commit
23551 Fix 'git remote show' regression on empty repository in 1.5.4
23552 git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
23555 timezone_names[]: fixed the tz offset for New Zealand.
23557 Uwe Kleine-König (1):
23558 config.txt: refer to --upload-pack and --receive-pack instead of --exec
23561 Version v1.5.4.3; changes since v1.5.4.2:
23562 -----------------------------------------
23565 git-clone.sh: properly configure remote even if remote's head is dangling
23568 git-gui: support Git Gui.app under OS X 10.5
23569 send-email: squelch warning due to comparing undefined $_ to ""
23572 push: indicate partialness of error message
23573 Documentation/push: clarify matching refspec behavior
23574 push: document the status output
23575 hash: fix lookup_hash semantics
23577 Junio C Hamano (1):
23580 Kristian Høgsberg (1):
23581 Rename git-core rpm to just git and rename the meta-pacakge to git-all.
23584 Documentation/git-stash: document options for git stash list
23586 Pekka Kaitaniemi (1):
23587 Clarified the meaning of git-add -u in the documentation
23589 Shawn O. Pearce (5):
23590 git-gui: Ensure error dialogs always appear over all other windows
23591 git-gui: Paper bag fix error dialogs opening over the main window
23592 git-gui: Default TCL_PATH to same location as TCLTK_PATH
23593 git-gui: Avoid hardcoded Windows paths in Cygwin package files
23594 git-gui: Focus insertion point at end of strings in repository chooser
23596 Wincent Colaiuta (1):
23597 git-gui: relax "dirty" version detection
23600 Version v1.5.4.2; changes since v1.5.4.1:
23601 -----------------------------------------
23603 Christian Couder (8):
23604 config: add test cases for empty value and no value config variables.
23605 diff.c: replace a 'strdup' with 'xstrdup'.
23606 diff.c: remove useless check for value != NULL
23607 config: add 'git_config_string' to refactor string config variables.
23608 Add "const" qualifier to "char *pager_program".
23609 Add "const" qualifier to "char *editor_program".
23610 Add "const" qualifier to "char *excludes_file".
23611 diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"
23613 Daniel Barkalow (1):
23614 Validate nicknames of remote branches to prohibit confusing ones
23616 David Steven Tweed (1):
23617 Make git prune remove temporary packs that look like write failures
23619 Frank Lichtenheld (1):
23620 config: Fix --unset for continuation lines
23623 builtin-commit: remove .git/SQUASH_MSG upon successful commit
23624 cvsimport: have default merge regex also match beginning of commit message
23627 Add a BuildRequires for gettext in the spec file.
23630 mailinfo: feed only one line to handle_filter() for QP input
23633 status: suggest "git rm --cached" to unstage for initial commit
23634 commit: discard index after setting up partial commit
23636 Johannes Schindelin (3):
23637 bisect: allow starting with a detached HEAD
23638 Document that the default of branch.autosetupmerge is true
23639 bisect: use verbatim commit subject in the bisect log
23642 upload-pack: Initialize the exec-path.
23645 man pages are littered with .ft C and others
23647 Junio C Hamano (31):
23648 git-pull documentation: fix markup
23649 archive-tar.c: guard config parser from value=NULL
23650 Add config_error_nonbool() helper function
23651 builtin-apply.c: guard config parser from value=NULL
23652 builtin-branch.c: guard config parser from value=NULL
23653 builtin-commit.c: guard config parser from value=NULL
23654 builtin-config.c: guard config parser from value=NULL
23655 builtin-log.c: guard config parser from value=NULL
23656 builtin-reflog.c: guard config parser from value=NULL
23657 builtin-show-branch.c: guard config parser from value=NULL
23658 builtin-tag.c: guard config parser from value=NULL
23659 connect.c: guard config parser from value=NULL
23660 convert.c: guard config parser from value=NULL
23661 diff.c: guard config parser from value=NULL
23662 git.c: guard config parser from value=NULL
23663 help.c: guard config parser from value=NULL
23664 http.c: guard config parser from value=NULL
23665 merge-recursive.c: guard config parser from value=NULL
23666 remote.c: guard config parser from value=NULL
23667 setup.c: guard config parser from value=NULL
23668 wt-status.c: guard config parser from value=NULL
23669 imap-send.c: guard config parser from value=NULL
23670 builtin-log.c: guard config parser from value=NULL
23671 config.c: guard config parser from value=NULL
23672 Revert "pack-objects: only throw away data during memory pressure"
23673 Protect get_author_ident_from_commit() from filenames in work tree
23674 diff.c: fixup garding of config parser from value=NULL
23675 diff: Fix miscounting of --check output
23676 filter-branch: handle filenames that need quoting
23677 Documentation/git-reset:
23680 Martin Koegler (1):
23681 pack-objects: only throw away data during memory pressure
23684 Work around curl-gnutls not liking to be reinitialized
23687 builtin-gc.c: guard config parser from value=NULL
23688 git clone -s documentation: force a new paragraph for the NOTE
23691 Documentation/git-reset: don't mention --mixed for selected-paths reset
23692 Documentation/git-reset: Add an example of resetting selected paths
23694 Sergei Organov (1):
23695 git-cvsimport.txt: fix '-M' description.
23697 Shawn O. Pearce (1):
23698 fast-import: check return value from unpack_entry()
23701 hg-to-git: fix parent analysis
23703 Uwe Kleine-König (1):
23704 rebase -i: accept -m as advertised in the man page
23707 Version v1.5.4.1; changes since v1.5.4:
23708 ---------------------------------------
23711 INSTALL: git-merge no longer uses cpio
23714 Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)
23716 Junio C Hamano (3):
23717 Update stale documentation links from the main documentation.
23718 Fix "git-commit -C $tag"
23719 gitattributes: fix relative path matching
23722 git-am: fix type in its usage string
23723 git-remote documentation: fix synopsis to match description
23726 Fix typo in 'blame' documentation.
23729 Fix parsing numeric color values
23732 Version v1.5.4; changes since v1.5.4-rc5:
23733 -----------------------------------------
23736 git-relink: avoid hard linking in objects/info directory
23737 filter-branch.sh: remove temporary directory on failure
23738 filter-branch docs: remove brackets so not to imply revision arg is optional
23739 filter-branch: assume HEAD if no revision supplied
23742 gitweb: Make use of the $git_dir variable at sub git_get_project_description
23744 Christian Couder (3):
23745 Documentation: config: add "browser.<tool>.path".
23746 Documentation: help: specify supported html browsers.
23747 instaweb: use 'browser.<tool>.path' config option if it's set.
23749 Jakub Narębski (1):
23750 gitweb: Add info about $projectroot and $projects_list to gitweb/README
23752 Jean-Luc Herren (1):
23753 Documentation/git-cvsserver: Fix typo
23756 t9001: add missing && operators
23761 Johannes Schindelin (1):
23762 Add test for rebase -i with commits that do not pass pre-commit
23764 Junio C Hamano (4):
23765 reflog-expire: Avoid creating new files in a directory inside readdir(3) loop
23766 Revert "filter-branch docs: remove brackets so not to imply revision arg is optional"
23767 Fix "git checkout -b foo ':/substring'"
23770 Michele Ballabio (1):
23771 Fix typo in a comment in t/test-lib.sh
23774 git rev-parse manpage: spelling fix
23776 Shawn O. Pearce (1):
23777 Use 'printf %s $x' notation in t5401
23780 gitweb: Convert generated contents to utf8 in commitdiff_plain
23783 Version v1.5.4-rc5; changes since v1.5.4-rc4:
23784 ---------------------------------------------
23787 Make t5710 more strict when creating nested repos
23790 git-commit: exit non-zero if we fail to commit the index
23793 git-svn: default to repacking every 1000 commits
23795 Gustaf Hendeby (1):
23796 send-email, fix breakage in combination with --compose
23798 Jakub Narębski (1):
23799 autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>.
23801 Johannes Schindelin (1):
23802 pull --rebase: be cleverer with rebased upstream branches
23804 Junio C Hamano (5):
23805 git-submodule: rename shell functions for consistency
23806 git-submodule: fix subcommand parser
23807 git-submodule: add test for the subcommand parser fix
23808 Clarify that http-push being temporarily disabled with older cURL
23812 Add a missing dependency on http.h
23813 Documentation: add a bit about sendemail.to configuration
23816 git-clone -s: document problems with git gc --prune
23817 git pull manpage: don't include -n from fetch-options.txt
23820 pack-objects: Fix segfault when object count is less than thread count
23822 Pierre Habouzit (1):
23823 parse-options: catch likely typo in presense of aggregated options.
23825 Robert Schiele (2):
23826 pre-POSIX.1-2001 systems do not have <sys/select.h>
23827 Makefile: customization for supporting HP-UX
23830 git-svn(1): update instructions for resuming a git-svn clone
23832 Shawn O. Pearce (10):
23833 git-gui: Honor the standard commit-msg hook
23834 git-gui: Correct window title for hook failure dialogs
23835 git-gui: Consolidate hook execution code into a single function
23836 git-gui: Correct encoding of glossary/fr.po to UTF-8
23837 Teach fast-import to honor pack.compression and pack.depth
23838 Document the hairy gfi_unpack_entry part of fast-import
23839 git-gui: Work around random missing scrollbar in revision list
23840 git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available
23841 git-gui: Make the statistics of po2msg match those of msgfmt
23842 git-gui: Correctly cleanup msgfmt '1 message untranslated' output
23844 Steffen Prohaska (3):
23845 submodule: Document the details of the command line syntax
23846 t9400-git-cvsserver-server: Wrap setup into test case
23847 cvsserver: Fix for histories with multiple roots
23850 Version v1.5.4-rc4; changes since v1.5.4-rc3:
23851 ---------------------------------------------
23854 Correct spelling in diff.c comment
23857 close_lock_file(): new function in the lockfile API
23858 Improve use of lockfile API
23859 refs.c: rework ref_locks by abstracting from underlying struct lock_file
23860 fast-import.c: don't try to commit marks file if write failed
23862 Christian Couder (2):
23863 git-gui: Initial french translation
23864 git-gui: add french glossary: glossary/fr.po
23866 Christian Stimming (4):
23867 git-gui: Update glossary: add term "hunk"
23868 git-gui: Update German translation
23869 git-gui: Fix broken revert confirmation.
23870 git-gui: Improve German translation.
23873 Remove usage of git- (dash) commands from email hook
23874 cvsimport: remove last use of repo-config from git standard tools
23875 Update git-completion for new 'remote rm' option
23877 Dave Peticolas (1):
23878 Documentation: fix and clarify grammar in git-merge docs.
23880 Dmitry Potapov (1):
23881 treat any file with NUL as binary
23884 git-svn: handle leading/trailing whitespace from svnsync revprops
23886 Grégoire Barbier (4):
23887 http-push: disable http-push without USE_CURL_MULTI
23888 http-push: fix webdav lock leak.
23889 http-push: fail when info/refs exists and is already locked
23890 http-push and http-fetch: handle URLs without trailing /
23892 Jakub Narębski (1):
23893 autoconf: Add checking for unsetenv function
23895 Jean-Luc Herren (1):
23896 Make default pre-commit hook less noisy
23899 git-clean: fix off-by-one memory access when given no arguments
23900 color unchanged lines as "plain" in "diff --color-words"
23901 send-email: detect invocation errors earlier
23902 send-email: validate patches before sending anything
23903 send-email: add no-validate option
23906 fast-import: Don't use a maybe-clobbered errno value
23907 doc typo: s/prior committing/prior to committing/
23909 Johannes Schindelin (1):
23910 gitk: make Ctrl "+" really increase the font size
23912 Junio C Hamano (8):
23913 builtin-commit.c: remove useless check added by faulty cut and paste
23914 Revert "builtin-commit.c: remove useless check added by faulty cut and paste"
23915 Fix git-rerere documentation
23916 Squelch bogus progress output from git-rebase--interactive
23917 Document lockfile API
23918 Officially deprecate repo-config.
23919 http-push: clarify the reason of error from the initial PROPFIND request
23922 Kristian Høgsberg (1):
23923 git-commit: fix double close(2) that can close a wrong file descriptor
23926 Move sha1_file_to_archive into libgit
23928 Linus Torvalds (4):
23929 Fix performance regression for partial commits
23930 Make builtin-commit.c more careful about parenthood
23931 Make 'git fsck' complain about non-commit branches
23932 Be more careful about updating refs
23935 hg-to-git: improve popen calls
23938 git-gui: Makefile - Handle $DESTDIR on Cygwin
23940 Martin Koegler (1):
23941 parse_commit_buffer: tighten checks while parsing
23944 Add using merge subtree How-To
23945 ls-remote: add -t and -h options.
23946 Include rev-list options in git-log manpage.
23948 Peter Krefting (1):
23949 git-gui: Updated Swedish translation after mailing list review.
23951 Shawn O. Pearce (3):
23952 git-gui: Allow 'Create New Repository' on existing directories
23953 git-gui: Refresh file status description after hunk application
23954 Fix random fast-import errors when compiled with NO_MMAP
23957 core-tutorial typofix
23960 Version v1.5.4-rc3; changes since v1.5.4-rc2:
23961 ---------------------------------------------
23963 Alexandre Julliard (6):
23964 git.el: Support for getting diffs from inside the log-edit buffer.
23965 git.el: Retrieve the permissions for up-to-date files.
23966 git.el: Display file types and type changes.
23967 git.el: Make sure we never insert the same file twice.
23968 git.el: Refresh files from their real state upon commit.
23969 git.el: Make status refresh faster.
23972 git-gui: Make commit log messages end with a newline
23975 git-relink.txt: describe more clearly how hard linking occurs
23977 Charles Bailey (1):
23978 gitk: Fix the Makefile to cope with systems lacking msgfmt
23980 Christian Couder (1):
23981 Documentation: config: add 'help.*' and 'instaweb.*' variables.
23983 Christian Stimming (10):
23984 gitk i18n: Add Makefile with rules for po file creation and installation
23985 gitk i18n: Import msgcat for message string translation; load translation catalogs
23986 gitk i18n: Markup several strings for translation
23987 gitk i18n: Initial German translation
23988 gitk i18n: More markup -- various options menus
23989 gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8.
23990 gitk: Update and fix Makefile
23991 gitk: Update German translation
23992 gitk: Fix typo in user message.
23993 gitk: Update German translation.
23996 Documentation: rename gitlink macro to linkgit
23999 git-svn: allow dcommit --no-rebase to commit multiple, dependent changes
24000 git-svn: unlink index files that were globbed, too
24001 git-svn: support for funky branch and project names over HTTP(S)
24002 git-svn: clarify the "Ignoring error from SVN" piece
24004 Florian La Roche (1):
24005 Change git-gc documentation to reflect gc.packrefs implementation.
24008 gitk: use user-configured background in view definition dialog
24010 Grégoire Barbier (1):
24011 Fix double-free() in http-push.c:remote_exists()
24013 Gustaf Hendeby (1):
24014 Documentation/user-manual.txt: fix typo
24016 J. Bruce Fields (1):
24017 Documentation: fix remote.<name>.skipDefaultUpdate description
24020 Make the git metapackage require the same version of the subpackages.
24023 config: handle lack of newline at end of file better
24024 git-reset: refuse to do hard reset in a bare repository
24025 add a "basic" diff config callback
24026 diff: load funcname patterns in "basic" config
24027 diff: remove lazy config loading
24028 add--interactive: remove unused diff colors
24029 add--interactive: allow diff colors without interactive colors
24030 Document the color.interactive semantics
24033 Fix grammar nits in documentation and in code comments.
24034 Don't access line[-1] for a zero-length "line" from fgets.
24035 bundle, fast-import: detect write failure
24037 Johannes Schindelin (2):
24038 Optimize prefixcmp()
24039 shortlog: mention the "-e" option in the usage
24042 git-gui: Move frequently used commands to the top of the context menu.
24043 recv_sideband: Do not use ANSI escape sequence on dumb terminals.
24045 Junio C Hamano (27):
24046 Documentation/git-submodule.txt: typofix
24047 "git pull --tags": error out with a better message.
24048 git-rebase -i behaves better on commits with incomplete messages
24049 git-rebase -i: clean-up error check codepath.
24050 lock_any_ref_for_update(): reject wildcard return from check_ref_format
24051 Update callers of check_ref_format()
24052 Uninline prefixcmp()
24053 git-clean: make "Would remove ..." path relative to cwd again
24054 t/t7600: avoid GNUism in grep
24055 t/t{3600,3800,5401}: do not use egrep when grep would do
24056 t/t3800: do not use a temporary file to hold expected result.
24057 Update draft release notes for 1.5.4
24058 git-stash clear: refuse to work with extra parameter for now
24059 git-rev-parse --symbolic-full-name
24060 filter-branch: work correctly with ambiguous refnames
24061 custom pretty format: tolerate empty e-mail address
24062 Documentation: remove gitman.info with "make clean"
24063 Documentation: fix "gitlink::foobar[s]"
24064 utf8: pick_one_utf8_char()
24065 utf8_width(): allow non NUL-terminated input
24066 diff: do not chomp hunk-header in the middle of a character
24067 Update draft release notes for 1.5.4
24069 "git-apply --check" should not report "fixed"
24070 pack-objects: remove redundant and wrong call to deflateEnd()
24071 RPM spec: include gitk message files.
24075 Trim leading / off of paths in git-svn prop_walk
24077 Marco Costalba (2):
24078 Document git-reset defaults to HEAD if no commit is given
24079 git-stash: use stdout instead of stderr for non error messages
24082 git-gui: Unconditionally use absolute paths with Cygwin
24083 Documentation/Makefile - honor $DESTDIR for quick-install target
24085 Martin Koegler (4):
24086 receive-pack: check object type of sha1 before using them as commits
24087 receive-pack: reject invalid refnames
24088 parse_tag_buffer: don't parse invalid tags
24089 tree-walk: don't parse incorrect entries
24091 Michael Stefaniuc (1):
24092 git-am: Run git gc only once and not for every patch.
24094 Michele Ballabio (1):
24095 Document some default values in config.txt
24098 git-sh-setup: document git_editor() and get_author_ident_from_commit()
24099 t/t7001: avoid unnecessary ERE when using grep
24102 slightly better auto gc message
24104 Paul Mackerras (2):
24105 gitk: Recode de.po to UTF-8
24106 gitk: Restore some widget options whose defaults changed in Tk 8.5
24108 Peter Krefting (1):
24109 Added Swedish translation.
24111 Ralf Wildenhues (1):
24112 Documentation: typofix
24115 Allow git-mergetool to handle paths with a leading space
24117 Shawn O. Pearce (1):
24118 git-gui: Handle file mode changes (644->755) in diff viewer
24121 Version v1.5.4-rc2; changes since v1.5.4-rc1:
24122 ---------------------------------------------
24125 Allow selection of different cleanup modes for commit messages
24127 Arjen Laarhoven (1):
24128 Fix "git log --diff-filter" bug
24130 Charles Bailey (1):
24131 Remove old generated files from .gitignore.
24133 Gustaf Hendeby (2):
24134 Make git send-email accept $EDITOR with arguments
24135 shortlog manpage documentation: work around asciidoc markup issues
24137 Jakub Narębski (1):
24138 gitweb: fix whitespace in config_to_multi (indent with tab)
24141 clean up 1.5.4 release notes
24142 cvsimport: die on cvsps errors
24145 Don't dereference NULL upon lookup failure.
24147 Johannes Schindelin (2):
24148 Teach diff machinery to display other prefixes than "a/" and "b/"
24149 Mention git-shell's "cvs" substitution in the RelNotes
24151 Junio C Hamano (14):
24152 t4024: fix test script to use simpler sed pattern
24153 fix git commit --amend -m "new message"
24154 shell-scripts usage(): consistently exit with non-zero
24155 Documentation: ls-files -v is about "assume unchanged".
24156 Fix $EDITOR regression introduced by rewrite in C.
24157 t7005: do not exit inside test.
24158 builtin-commit: fix amending of the initial commit
24159 builtin-commit: avoid double-negation in the code.
24160 Documentation: describe 'union' low-level merge driver
24161 Fix documentation of --first-parent in git-log and copy it to git-rev-list
24162 combine-diff: Fix path quoting
24163 Fix rewrite_diff() name quoting.
24164 contrib: resurrect scripted git-revert.
24167 Linus Torvalds (1):
24168 Re(-re)*fix trim_common_tail()
24171 everyday: replace 'prune' and 'repack' with 'gc'
24173 Pierre Habouzit (3):
24174 git-tag: fix -l switch handling regression.
24175 Force the sticked form for options with optional arguments.
24176 parse-options: Add a gitcli(5) man page.
24179 Make "--pretty=format" parser a bit more careful.
24181 Shawn O. Pearce (2):
24182 Reallow git-rebase --interactive --continue if commit is unnecessary
24183 Improve error messages when int/long cannot be parsed from config
24185 Stefan Sperling (1):
24186 Small comment fix for git-cvsimport.
24188 Wincent Colaiuta (1):
24189 Emit helpful status for accidental "git stash" save
24192 Version v1.5.4-rc1; changes since v1.5.4-rc0:
24193 ---------------------------------------------
24195 Andy Whitcroft (1):
24196 git-svn: expand handling of From: and Signed-off-by:
24198 Charles Bailey (1):
24199 Fix git-instaweb breakage on MacOS X due to the limited sed functionality
24201 Christian Couder (1):
24202 git-help: add "help.format" config variable.
24204 David S. Miller (1):
24205 fast-import: fix unalinged allocation and access
24208 git-svn: unlink internal index files after operations
24209 git-svn: handle our top-level path being deleted and later re-added
24210 git-svn: avoid leaving leftover committer/author info in rebase
24211 git-svn: workaround a for broken symlinks in SVN
24212 git-svn: avoid warning when run without arguments
24214 Finn Arne Gangstad (1):
24215 Improved submodule merge support
24217 H.Merijn Brand (1):
24218 the use of 'tr' in the test suite isn't really portable
24220 J. Bruce Fields (8):
24221 whitespace: fix off-by-one error in non-space-in-indent checking
24222 whitespace: reorganize initial-indent check
24223 whitespace: minor cleanup
24224 whitespace: fix initial-indent checking
24225 whitespace: more accurate initial-indent highlighting
24226 whitespace: fix config.txt description of indent-with-non-tab
24227 builtin-apply: minor cleanup of whitespace detection
24228 builtin-apply: stronger indent-with-on-tab fixing
24230 Jakub Narębski (2):
24231 gitweb: disambiguate heads and tags withs the same name
24232 gitweb: Teach "a=blob" action to be more lenient about blob/file mime type
24235 cvsexportcommit: fix massive commits
24236 trim_common_tail: brown paper bag fix.
24237 teach bash completion to treat commands with "--" as a helper
24238 rename git-browse--help to git-help--browse
24239 clone: correctly report http_fetch errors
24240 git-send-email: avoid duplicate message-ids
24241 test "git clone -o"
24244 git-filter-branch.sh: more portable tr usage: use \012, not \n.
24246 Johannes Schindelin (4):
24247 Support config variable diff.external
24248 Document diff.external and mergetool.<tool>.path
24249 rebase -p -i: handle "no changes" gracefully
24250 git show <tag>: show the tagger
24253 threaded pack-objects: Use condition variables for thread communication.
24254 Plug a resource leak in threaded pack-objects code.
24255 Clean up documentation that references deprecated 'git peek-remote'.
24256 filter-branch: Remove broken and unnecessary summary of rewritten refs.
24258 Junio C Hamano (18):
24259 git-commit: squelch needless message during an empty merge
24260 xdl_diff: identify call sites.
24261 xdi_diff: trim common trailing lines
24262 diff --check: minor fixups
24263 Add tests for "git diff --check" with core.whitespace options
24264 xdiff tail trimming: use correct type.
24265 commit: allow --amend to reuse message from another commit
24266 remote: Fix bogus make_branch() call in configuration reader.
24267 Rename git-browse-help helper to git-browse--help
24268 Retire git-runstatus for real.
24269 Start preparing the API documents.
24270 Update draft release notes for 1.5.4
24271 Re-re-re-fix common tail optimization
24272 builtin-commit: fix summary output.
24273 builtin-commit: make summary output consistent with status
24274 Documentation/git-submodule: refer to gitmodules(5)
24275 builtin-blame.c: remove unneeded memclr()
24278 Kristian Høgsberg (1):
24279 Use a strbuf for building up section header and key/value pair strings.
24284 Linus Torvalds (1):
24285 unpack-trees: FLEX_ARRAY fix
24288 clone: fix options '-o' and '--origin' to be recognised again
24291 Fix some more memory leaks in http-push.c
24292 Fix random sha1 in error message in http-fetch and http-push
24293 Remove the default_headers variable from http-push.c
24294 Remove a CURLOPT_HTTPHEADER (un)setting
24295 Avoid redundant declaration of missing_target()
24296 Use strbuf in http code
24297 Fix various memory leaks in http-push.c and http-walker.c
24298 Move fetch_ref from http-push.c and http-walker.c to http.c
24301 provide advance warning of some future pack default changes
24302 fix style of a few comments in diff-delta.c
24303 make 'git describe --all --contains' work
24306 gitweb: Make config_to_multi return [] instead of [undef]
24308 Pierre Habouzit (1):
24309 Fix segfault in diff-delta.c when FLEX_ARRAY is 1
24311 Ralf Wildenhues (1):
24312 Fix some documentation typos.
24315 Clarify error response from 'git fetch' for bad responses
24317 Sean Estabrooks (1):
24318 Fix interactive rebase to preserve author email address
24321 Fix spelling mistakes in user manual
24323 Shawn O. Pearce (2):
24324 Avoid update hook during git-rebase --interactive
24325 Catch and handle git-commit failures in git-rebase --interactive
24327 Wincent Colaiuta (5):
24328 "diff --check" should affect exit status
24329 Unify whitespace checking
24330 Make "diff --check" output match "git apply"
24331 Use shorter error messages for whitespace problems
24332 Test interaction between diff --check and --exit-code
24335 Documentation: describe pack idx v2
24338 Version v1.5.4-rc0; changes since v1.5.3.8:
24339 -------------------------------------------
24342 fix t5403-post-checkout-hook.sh: built-in test in dash does not have "=="
24343 Fix a crash in ls-remote when refspec expands into nothing
24344 More updates and corrections to the russian translation of git-gui
24345 Rework make_usage to print the usage message immediately
24346 Updated russian translation of git-gui
24347 Do no colorify test output if stdout is not a terminal
24348 Add a test checking if send-pack updated local tracking branches correctly
24349 Update the tracking references only if they were succesfully updated on remote
24350 Fix dependencies of parse-options test program
24351 Do not generate full commit log message if it is not going to be used
24352 Simplify crud() in ident.c
24353 Fix git-fast-export for zero-sized blobs
24355 Alexandre Julliard (12):
24356 git.el: Keep the status buffer sorted by filename.
24357 git.el: Allow selecting whether to display uptodate/unknown/ignored files.
24358 git.el: Allow the add and remove commands to be applied to ignored files.
24359 git.el: Preserve file marks when doing a full refresh.
24360 git.el: Do not print a status message on every git command.
24361 git.el: Update a file status in the git buffer upon save.
24362 git.el: Reset the permission flags when changing a file state.
24363 git.el: Fix typo in "Reverted file" message.
24364 git.el: Fix typo in git-update-saved-file error handling.
24365 git.el: Refresh only the changed file marks when marking/unmarking all.
24366 git.el: Run git-gc --auto after commits.
24367 git.el: Added a menu for git-status-mode.
24369 Andreas Ericsson (1):
24370 Simplify strchrnul() compat code
24372 André Goddard Rosa (2):
24373 Print the real filename that we failed to open.
24374 Error out when user doesn't have access permission to the repository
24377 parse_date_format(): convert a format name to an enum date_mode
24378 Make for-each-ref allow atom names like "<name>:<something>"
24379 Make for-each-ref's grab_date() support per-atom formatting
24380 Add a test script for for-each-ref, including test of date formatting
24382 Andy Whitcroft (6):
24383 Teach send-pack a mirror mode
24384 git-push: plumb in --mirror mode
24385 Add tests for git push'es mirror mode
24386 git-push: add documentation for the newly added --mirror mode
24387 git-quiltimport.sh fix --patches handling
24388 git-svn: add support for pulling author from From: and Signed-off-by:
24390 Anton Gyllenberg (1):
24391 gitview: import only one of gtksourceview and gtksourceview2
24393 Ask Bjørn Hansen (1):
24394 send-email: Don't add To: recipients to the Cc: header
24396 Benoit Sigoure (7):
24397 git-svn: add a generic tree traversal to fetch SVN properties
24398 git-svn: implement git svn create-ignore
24399 git-svn: add git svn propget
24400 git-svn: add git svn proplist
24401 git-svn: simplify the handling of fatal errors
24402 core-tutorial: Catch up with current Git
24403 git-svn: sort the options in the --help message.
24405 Björn Steinbrink (1):
24406 git config: Don't rely on regexec() returning 1 on non-match
24408 Blake Ramsdell (1):
24409 transport.c: squelch a gcc 4.0.1 complaint about an uninitialized variable
24412 git-gc: by default use safer "-A" option to repack when not --prune'ing
24413 git-gc --auto: simplify "repack" command line building
24416 Add a --dry-run option to git-send-pack.
24417 Add a --dry-run option to git-push.
24419 Brian Gernhardt (3):
24420 format-patch: Add configuration and off switch for --numbered
24421 format-patch: Test --[no-]numbered and format.numbered
24422 t3502: Disambiguate between file and rev by adding --
24424 Brian M. Carlson (1):
24425 git-gui: Reorder msgfmt command-line arguments
24428 Function for updating refs.
24429 Add tests for documented features of "git reset".
24430 Move make_cache_entry() from merge-recursive.c into read-cache.c
24431 Make "git reset" a builtin.
24432 Make builtin-tag.c use parse_options.
24434 Charles Bailey (1):
24435 Fix clone not to ignore depth when performing a local clone
24438 gitweb: the commitdiff is very commonly used, it's needed on search page, too
24441 git-p4 support for perforce renames.
24442 git-p4: Add a helper function to parse the full git diff-tree output.
24443 git-p4: Detect changes to executable bit and include them in p4 submit.
24445 Christian Couder (27):
24446 rev-list --bisect: Move finding bisection into do_find_bisection.
24447 rev-list --bisect: Move some bisection code into best_bisection.
24448 rev-list --bisect: Bisection "distance" clean up.
24449 rev-list --bisect: Fix best == NULL case.
24450 Test suite: reset TERM to its previous value after testing.
24451 rev-list: implement --bisect-all
24452 rev-list documentation: add "--bisect-all".
24453 Bisect: fix some white spaces and empty lines breakages.
24454 Bisect: implement "bisect skip" to mark untestable revisions.
24455 Bisect: refactor "bisect_write_*" functions.
24456 Bisect: refactor some logging into "bisect_write".
24457 Bisect: refactor "bisect_{bad,good,skip}" into "bisect_state".
24458 Bisect: add "bisect skip" to the documentation.
24459 Bisect: add a "bisect replay" test case.
24460 Bisect run: "skip" current commit if script exit code is 125.
24461 Bisect: add "skip" to the short usage string.
24462 Bisect reset: remove bisect refs that may have been packed.
24463 Bisect visualize: use "for-each-ref" to list all good refs.
24464 Bisect: use "$GIT_DIR/BISECT_NAMES" to check if we are bisecting.
24465 Bisect reset: do nothing when not bisecting.
24466 Documentation: add a new man page for "git-help"
24467 Trace and quote with argv: get rid of unneeded count argument.
24468 git-help: add -i|--info option to display info page.
24469 Documentation: describe -i/--info option to "git-help"
24470 git-help: add -w|--web option to display html man page in a browser.
24471 Use {web,instaweb,help}.browser config options.
24472 Documentation: describe -w/--web option to "git-help".
24474 Christian Stimming (14):
24475 Mark strings for translation.
24476 Makefile rules for translation catalog generation and installation.
24477 Add glossary that can be converted into a po file for each language.
24478 Add glossary translation template into git.
24479 German translation for git-gui
24480 German glossary for translation
24481 git-gui: Add more words to translation glossary
24482 git-gui: Update German glossary according to mailing list discussion
24483 git-gui: Incorporate glossary changes into existing German translation
24484 git-gui: Update German translation, including latest glossary changes
24485 git-gui: Add more terms to glossary.
24486 git-gui: Update German translation
24487 Update git-gui.pot with latest (few) string additions and changes.
24488 Update German translation. 100% completed.
24491 Remove outdated references to cogito in documentation
24493 Daniel Barkalow (23):
24494 Refactor http.h USE_CURL_MULTI fill_active_slots().
24495 Make function to refill http queue a callback
24496 Remove obsolete commit-walkers
24497 Modularize commit-walker
24498 Add uploadpack configuration info to remote.
24499 Report information on branches from remote.h
24500 Make fetch-pack a builtin with an internal API
24501 Push code for transport library
24502 Add matching and parsing for fetch-side refspec rules
24503 Add fetch methods to transport library.
24504 Make fetch a builtin
24505 Allow abbreviations in the first refspec to be merged
24506 Fix adding a submodule with a remote url
24507 Restore default verbosity for http fetches.
24508 Remove duplicate ref matches in fetch
24509 Correct handling of upload-pack in builtin-fetch-pack
24510 Miscellaneous const changes and utilities
24511 Build-in peek-remote, using transport infrastructure.
24512 Use built-in send-pack.
24513 Build-in send-pack, with an API for other programs to call.
24515 Use parseopts in builtin-push
24516 Add more checkout tests
24518 David D. Kilzer (8):
24519 git-svn log: fix ascending revision ranges
24520 git-svn log: include commit log for the smallest revision in a range
24521 git-svn log: handle unreachable revisions like "svn log"
24522 git-send-email: show all headers when sending mail
24523 git-svn: extract reusable code into utility functions
24524 git-svn info: implement info command
24525 git-svn: info --url [path]
24526 git-svn: Remove unnecessary Git::SVN::Util package
24529 diff-delta.c: pack the index structure
24530 diff-delta.c: Rationalize culling of hash buckets
24531 git-commit.sh: Shell script cleanup
24534 git-svn: Fix a typo and add a comma in an error message in git-svn
24537 gitweb: Provide title attributes for abbreviated author names.
24538 gitweb: Refactor abbreviation-with-title-attribute code.
24539 gitweb: Use chop_and_escape_str in more places.
24540 Rearrange git-format-patch synopsis to improve clarity.
24541 git-checkout: Support relative paths containing "..".
24542 git-checkout: Test for relative path use.
24543 Mention that git-rm can be an appropriate resolution as well as git-add.
24545 Dmitry Potapov (1):
24546 preserve executable bits in zip archives
24548 Douglas Stockwell (1):
24549 send-email: Add support for SSL and SMTP-AUTH
24552 Fixed a command line option type for builtin-fsck.c
24553 git-stash: Fix listing stashes
24556 git-svn: support for funky branch and project names over HTTP(S)
24557 git-svn: add tests for command-line usage of init and clone commands
24558 t9106: fix a race condition that caused svn to miss modifications
24559 git-svn: allow `info' command to work offline
24560 git-svn: replace .rev_db with a more space-efficient .rev_map format
24561 git-svn: reinstate old rev_db optimization in new rev_map
24563 Eygene Ryabinkin (2):
24564 git-svn: respect Subversion's [auth] section configuration values
24565 git-svn: use "no warnings 'once'" to disable false-positives
24567 Eyvind Bernhardsen (1):
24568 Fix mis-markup of the -p, --patch option in git-add(1)
24570 Frederick Akalin (1):
24571 gtksourceview2 support for gitview
24574 No longer install git-svnimport, move to contrib/examples
24575 git-reset: add -q option to operate quietly
24576 contrib/hooks/post-receive-email: fix typo
24577 contrib/hooks/post-receive-email: reformat to wrap comments at 76 chars
24578 contrib/hooks/post-receive-email: make subject prefix configurable
24579 hooks--update: fix test for properly set up project description file
24580 hooks--update: decline deleting tags or branches by default, add config options
24581 contrib/hooks/post-receive-email: remove cruft, $committer is not used
24582 Don't cache DESTDIR in perl/perl.mak.
24585 git-cvsimport: fix handling of user name when it is not set in CVSROOT
24588 Remove unreachable statements
24589 Use compat mkdtemp() on Solaris boxes
24591 Gustaf Hendeby (1):
24592 git-svn now reads settings even if called in subdirectory
24594 H.Merijn Brand (1):
24595 Do not rely on the exit status of "unset" for unset variables
24597 Harri Ilari Tapio Liusvaara (1):
24598 git-gui: Disambiguate "commit"
24601 git-clone: honor "--" to end argument parsing
24604 git-gui: initial version of russian translation
24606 J. Bruce Fields (3):
24607 git-rebase: support --whitespace=<option>
24608 git-rebase: fix -C option
24609 errors: "strict subset" -> "ancestor"
24611 Jakub Narębski (18):
24612 gitweb: Fix and simplify "split patch" detection
24613 gitweb: Always set 'from_file' and 'to_file' in parse_difftree_raw_line
24614 gitweb: Add 'status_str' to parse_difftree_raw_line output
24615 gitweb: Remove CGI::Carp::set_programname() call from t9500 gitweb test
24616 gitweb: Easier adding/changing parameters to current URL
24617 gitweb: Use href(-replay=>1, page=>...) to generate pagination links
24618 gitweb: Use href(-replay=>1, action=>...) to generate alternate views
24619 gitweb: Add tests for overriding gitweb config with repo config
24620 gitweb: Read repo config using 'git config -z -l'
24621 gitweb: Use config file for repository description and URLs
24622 gitweb: Style all tables using CSS
24623 gitweb: Put project README in div.readme, fix its padding
24624 autoconf: Add tests for memmem, strtoumax and mkdtemp functions
24625 Add config_int() method to the Git perl module
24626 gitweb: Update and improve gitweb/README file
24627 contrib: Make remotes2config.sh script more robust
24628 autoconf: Add test for OLD_ICONV (squelching compiler warning)
24629 autoconf: Check asciidoc version to automatically set ASCIIDOC8
24632 remote: add 'rm' subcommand
24633 remote: document the 'rm' subcommand
24634 gc: use parse_options
24637 git-remote: exit with non-zero status after detecting error in "rm".
24638 On error, do not list all commands, but point to --help option
24641 contrib/fast-import: add perl version of simple example
24642 diffcore-rename: cache file deltas
24643 git-rebase: document suppression of duplicate commits
24644 send-pack: don't update tracking refs on error
24645 t5516: test update of local refs on push
24646 git-gc: improve wording of --auto notification
24647 Documentation/git-gc: explain --auto in description
24648 Documentation/git-gc: improve description of --auto
24649 more terse push output
24650 receive-pack: don't mention successful updates
24651 send-pack: require --verbose to show update of tracking refs
24652 git-ls-files: add --exclude-standard
24653 send-pack: track errors for each ref
24654 send-pack: check ref->status before updating tracking refs
24655 send-pack: assign remote errors to each ref
24656 make "find_ref_by_name" a public function
24657 send-pack: tighten remote error reporting
24658 send-pack: fix "everything up-to-date" message
24659 avoid "defined but not used" warning for fetch_objs_via_walker
24660 send-pack: cluster ref status reporting
24661 git-tag: test that -s implies an annotated tag
24662 Revert "t5516: test update of local refs on push"
24663 git-commit: clean up die messages
24664 Enable rewrite as well as rename detection in git-status
24665 quote_path: fix collapsing of relative paths
24666 t9600: require cvsps 2.1 to perform tests
24667 t7300: add test for clean with wildcard pathspec
24668 wt-status.c:quote_path(): convert empty path to "./"
24669 add status.relativePaths config variable
24670 git-status: documentation improvements
24671 don't mention index refreshing side effect in git-status docs
24672 Add git-browse-help to .gitignore
24673 Support GIT_PAGER_IN_USE environment variable
24674 git-svn: get color config from --get-colorbool
24675 shortlog: document -e option
24676 git-clone: print an error message when trying to clone empty repo
24678 Jeff Muizelaar (1):
24679 fix contrib/hooks/post-receive-email hooks.recipients error message
24682 hooks-pre-commit: use \t, rather than a literal TAB in regexp
24684 Johannes Schindelin (57):
24687 Teach "git remote" a mirror mode
24688 verify-tag: also grok CR/LFs in the tag signature
24689 apply: get rid of --index-info in favor of --build-fake-ancestor
24690 Move bundle specific stuff into bundle.[ch]
24691 Add bundle transport
24692 git-gui: Deiconify startup wizard so it raises to the top
24693 git-gui: add a simple msgfmt replacement
24694 rebase -i: commit when continuing after "edit"
24695 rebase -i: style fixes and minor cleanups
24696 rebase -i: Fix numbers in progress report
24697 rebase -i: avoid exporting GIT_AUTHOR_* variables
24698 rebase -i: work on a detached HEAD
24699 rebase -i: support single-letter abbreviations for the actions
24700 Introduce remove_dir_recursively()
24701 fetch/push: readd rsync support
24702 Support cvs via git-shell
24703 Fix compilation when NO_CURL is defined
24704 cvsexportcommit: get rid of temporary directory
24705 fetch: if not fetching from default remote, ignore default merge
24706 Deduce exec_path also from calls to git with a relative path
24707 Add tests for parse-options.c
24708 parse-options: Allow abbreviated options when unambiguous
24709 po2msg: ignore entries marked with "fuzzy"
24710 po2msg: ignore untranslated messages
24711 po2msg: actually output statistics
24712 git-reset: do not be confused if there is nothing to reset
24713 Split off the pretty print stuff into its own file
24714 parse-options: abbreviation engine fix.
24715 builtin-reset: do not call "ls-files --unmerged"
24716 builtin-reset: avoid forking "update-index --refresh"
24717 Deprecate git-lost-found
24718 rebase: operate on a detached HEAD
24719 builtin-blame: set up the work_tree before the first file access
24720 rebase: fix "rebase --continue" breakage
24721 Close files opened by lock_file() before unlinking.
24722 rebase -i: move help to end of todo file
24723 launch_editor(): read the file, even when EDITOR=:
24724 builtin-commit: fix reflog message generation
24725 git status: show relative paths when run in a subdirectory
24726 builtin-commit: fix --signoff
24727 builtin-commit --s: add a newline if the last line was not a S-o-b
24728 builtin-commit: resurrect behavior for multiple -m options
24729 builtin-commit: Add newline when showing which commit was created
24730 Replace "runstatus" with "status" in the tests
24731 filter-branch: fix dirty way to provide the helpers to commit filters
24732 git checkout's reflog: even when detaching the HEAD, say from where
24733 bash completion: add diff options
24734 Replace instances of export VAR=VAL with VAR=VAL; export VAR
24735 Teach 'git pull' about --rebase
24736 rebase -i: give rerere a chance
24737 receive-pack: allow deletion of corrupt refs
24738 Add "--expire <time>" option to 'git prune'
24739 Add 'git fast-export', the sister of 'git fast-import'
24740 fast-export: rename the signed tag mode 'ignore' to 'verbatim'
24741 Allow ':/<oneline-prefix>' syntax to work with save_commit_buffer == 0
24743 Johannes Sixt (38):
24744 git-gui: Change main window layout to support wider screens
24745 gitk: Do not pick up file names of "copy from" lines
24746 Change git_connect() to return a struct child_process instead of a pid_t.
24747 Use start_command() in git_connect() instead of explicit fork/exec.
24748 Use start_command() to run content filters instead of explicit fork/exec.
24749 Use run_command() to spawn external diff programs instead of fork/exec.
24750 Use start_comand() in builtin-fetch-pack.c instead of explicit fork/exec.
24751 Have start_command() create a pipe to read the stderr of the child.
24752 upload-pack: Use start_command() to run pack-objects in create_pack_file().
24753 Add infrastructure to run a function asynchronously.
24754 Use the asyncronous function infrastructure in builtin-fetch-pack.c.
24755 upload-pack: Move the revision walker into a separate function.
24756 upload-pack: Run rev-list in an asynchronous function.
24757 t0021-conversion.sh: Test that the clean filter really cleans content.
24758 Avoid a dup2(2) in apply_filter() - start_command() can do it for us.
24759 Use the asyncronous function infrastructure to run the content filter.
24760 Fix an infinite loop in sq_quote_buf().
24761 upload-pack: Use finish_{command,async}() instead of waitpid().
24762 Give git-am back the ability to add Signed-off-by lines.
24763 git-clean: Fix error message if clean.requireForce is not set.
24764 Fix preprocessor logic that determines the availablity of strchrnul().
24765 t5300-pack-object.sh: Split the big verify-pack test into smaller parts.
24766 t7501-commit.sh: Not all seds understand option -i
24767 t5302-pack-index: Skip tests of 64-bit offsets if necessary.
24768 Skip t3902-quoted.sh if the file system does not support funny names.
24769 Use is_absolute_path() in sha1_file.c.
24770 Move #include <sys/select.h> and <sys/ioctl.h> to git-compat-util.h.
24771 builtin run_command: do not exit with -1.
24772 Allow a relative builtin template directory.
24773 Introduce git_etc_gitconfig() that encapsulates access of ETC_GITCONFIG.
24774 Allow ETC_GITCONFIG to be a relative path.
24775 refs.c: Remove unused get_ref_sha1()
24776 fetch-pack: Prepare for a side-band demultiplexer in a thread.
24777 Flush progress message buffer in display().
24778 git-gui: Improve the application icon on Windows.
24779 git-commit: Allow to amend a merge commit that does not change the tree
24780 for-each-ref: Fix quoting style constants.
24781 Fix a typo in checkout.sh and cleanup one-line help messages
24784 Update manpages to reflect new short and long option aliases
24785 Documentation: Fix references to deprecated commands
24787 Jonathan del Strother (2):
24788 Fixing path quoting in git-rebase
24789 gitk: Add support for OS X mouse wheel
24792 Add post-merge hook, related documentation, and tests.
24793 Added example hook script to save/restore permissions/ownership.
24794 post-checkout hook, tests, and docs
24795 Minor usage update in setgitperms.perl
24797 Junio C Hamano (157):
24798 Keep last used delta base in the delta window
24799 git-gui po/README: Guide to translators
24801 Implement git gc --auto
24802 Invoke "git gc --auto" from commit, merge, am and rebase.
24803 archive - leakfix for format_subst()
24804 git-commit: Allow partial commit of file removal.
24805 An additional test for "git-reset -- path"
24807 git-commit: partial commit of paths only removed from the index
24808 Document ls-files --with-tree=<tree-ish>
24809 builtin-pack-objects.c: avoid bogus gcc warnings
24810 stash: implement "stash create"
24811 rebase: allow starting from a dirty tree.
24812 Export matches_pack_name() and fix its return value
24813 pack-objects --keep-unreachable
24814 repack -A -d: use --keep-unreachable when repacking
24815 git-gc --auto: move threshold check to need_to_gc() function.
24816 git-gc --auto: add documentation.
24817 git-gc --auto: protect ourselves from accumulated cruft
24818 git-gc --auto: restructure the way "repack" command line is built.
24819 git-gc --auto: run "repack -A -d -l" as necessary.
24820 builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion.
24821 builtin-for-each-ref.c::copy_name() - do not overstep the buffer.
24822 git-remote rm: add tests and minor fix-ups
24823 Start RelNotes for 1.5.4
24824 strbuf_setlen(): do not barf on setting length of an empty buffer to 0
24825 send-email --smtp-server-port: allow overriding the default port
24826 rerere: Fix use of an empty strbuf.buf
24827 git-am: make the output quieter.
24828 bundle transport: fix an alloc_ref() call
24829 Update stale documentation link in the k.org site
24830 git-am: fix typo in the previous one.
24831 dateformat: parse %(xxdate) %(yydate:format) correctly
24832 builtin-apply: fix conversion error in strbuf series
24833 Update state documentation link for 1.5.3.4
24834 k.org git toppage: Add link to 1.5.3 release notes.
24835 help: remove extra blank line after "See 'git --help'" message
24836 revert/cherry-pick: work on merge commits as well
24837 git-fetch: do not fail when remote branch disappears
24838 RelNotes-1.5.4: describe recent updates
24839 git-gui: Update Japanese strings (part 2)
24840 Revert "rebase: allow starting from a dirty tree."
24841 git-merge: no reason to use cpio anymore
24842 format-patch -s: add MIME encoding header if signer's name requires so
24843 cherry-pick/revert -m: add tests
24844 test format-patch -s: make sure MIME content type is shown as needed
24845 War on whitespace: first, a bit of retreat.
24846 git-diff: complain about >=8 consecutive spaces in initial indent
24847 core.whitespace: add test for diff whitespace error highlighting
24848 clean: require -f to do damage by default
24849 gc: --prune prunes unreferenced objects.
24850 scripts: Add placeholders for OPTIONS_SPEC
24851 git-rev-parse --parseopt
24852 git-sh-setup: fix parseopt `eval` string underquoting
24853 send-pack: segfault fix on forced push
24854 Style: place opening brace of a function definition at column 1
24855 git-am: -i does not take a string parameter.
24856 Update draft release notes for 1.5.4
24857 Documentation: lost-found is now deprecated.
24858 Make check-docs target detect removed commands
24859 Documentation: remove documentation for removed tools.
24860 git-commit: a bit more tests
24861 Resurrect git-revert.sh example and add comment to builtin-revert.c
24862 core.excludesfile clean-up
24863 Fix per-directory exclude handing for "git add"
24864 git-bisect: war on "sed"
24865 git-bisect: use update-ref to mark good/bad commits
24866 git-bisect: modernize branch shuffling hack
24867 Update draft release notes for 1.5.4
24868 Draft release notes: fix clean.requireForce description
24869 Update draft release notes for 1.5.4
24870 Move gitk to its own subdirectory
24871 git-clean: Fix error message if clean.requireForce is not set.
24872 git-compat-util.h: auto-adjust to compiler support of FLEX_ARRAY a bit better
24873 Fix "quote" misconversion for rewrite diff output.
24874 Make test scripts executable.
24875 file_exists(): dangling symlinks do exist
24876 builtin-commit: do not color status output shown in the message template
24877 builtin-commit: run commit-msg hook with correct message file
24878 Export three helper functions from ls-files
24879 Fix add_files_to_cache() to take pathspec, not user specified list of files
24880 builtin-commit: fix partial-commit support
24881 Addendum to "MaintNotes"
24882 git-add -i: allow multiple selection in patch subcommand
24883 git-branch --contains=commit
24884 git-branch --contains: doc and test
24885 builtin-tag: accept and process multiple -m just like git-commit
24886 Add a few more tests for git-commit
24887 builtin-apply: rename "whitespace" variables and fix styles
24888 t4119: correct overeager war-on-whitespace
24889 builtin-apply: teach whitespace_rules
24890 core.whitespace: documentation updates.
24891 Deprecate peek-remote
24892 Update draft release notes for 1.5.4
24893 builtin-add: fix command line building to call interactive
24894 add -i: Fix running from a subdirectory
24895 "git-tag -s" should create a signed annotated tag
24896 revert/cherry-pick: do not mention the original ref
24897 "color.diff = true" is not "always" anymore.
24898 git-config --get-color: get configured color
24899 dir.c: minor clean-up
24900 per-directory-exclude: lazily read .gitignore files
24901 Update draft release notes for 1.5.4
24902 Resurrect peek-remote
24903 Consolidate command list to one.
24904 Update draft release notes for 1.5.4
24905 rename: Break filepairs with different types.
24906 git-am: catch missing author date early.
24907 Fix --signoff in builtin-commit differently.
24908 git-commit: Allow to amend a merge commit that does not change the tree
24909 git-commit --allow-empty
24910 git-commit --allow-empty
24911 git-commit documentation: fix unfinished sentence.
24912 Add git-fast-export to list of commands.
24913 Update draft release notes for 1.5.4
24914 Run the specified perl in Documentation/
24915 Formatting fix for Documentation/git-help.txt
24916 Documentation: rerere is enabled by default these days.
24917 Documentation/git.txt: typofix
24918 t5510: add a bit more tests for fetch
24919 git-cvsserver runs hooks/post-update
24920 Revert "git-am: catch missing author date early."
24921 Documentation: color.* = true means "auto"
24922 git config --get-colorbool
24923 Color support for "git-add -i"
24924 git-clean: Honor pathspec.
24925 config --get-colorbool: diff.color is a deprecated synonym to color.diff
24926 Use gitattributes to define per-path whitespace rule
24927 hg-to-git: handle an empty dir in hg.
24928 do not discard status in fetch_refs_via_pack()
24929 git-status documentation: mention subdirectory behaviour
24930 Update draft release notes to 1.5.4
24931 git-bisect visualize: work in non-windowed environments better
24932 mailmap: fix bogus for() loop that happened to be safe by accident
24933 shortlog: code restructuring and clean-up
24934 git-shortlog -e: show e-mail address as well
24935 ls-remote: resurrect pattern limit support
24936 Fix commit-msg hook to allow editing
24937 Re-fix "builtin-commit: fix --signoff"
24939 Update draft Release Notes for 1.5.4
24940 Documentation: add gitman.info target
24941 git-help -i: invoke info with document and node name
24942 git-help -i: show info documentation from matching version of git
24943 send-email: do not muck with initial-reply-to when unset.
24944 commit: do not add extra LF at the end of the summary.
24945 Support a merge with conflicting gitlink change
24946 blame: drop blob data after passing blame to the parent
24947 shortlog: default to HEAD when the standard input is a tty
24948 git-diff --numstat -z: make it machine readable
24949 disable t9119 for now.
24950 Documentation: rename git.texi to user-manual.texi
24951 git.spec.in: remove python_path
24952 git-help -w: do not require to be in git repository
24953 RPM spec: Adjust htmldir
24957 git-p4: Fix typo in --detect-labels
24958 git-stash: Display help message if git-stash is run with wrong sub-commands
24961 Updated Russian translation.
24963 Konstantin V. Arkhipov (1):
24964 git-svn's dcommit must use subversion's config
24966 Kristian Høgsberg (18):
24967 Enable wt-status output to a given FILE pointer.
24968 Enable wt-status to run against non-standard index file.
24969 Add strbuf_read_file().
24970 Clean up stripspace a bit, use strbuf even more.
24971 Introduce entry point add_interactive and add_files_to_cache
24972 Export rerere() and launch_editor().
24973 Port builtin-add.c to use the new option parser.
24974 Add testcase for amending and fixing author in git commit.
24975 Export launch_editor() and make it accept ':' as a no-op editor.
24976 Port git commit to C.
24977 builtin-commit: Refresh cache after adding files.
24978 Call refresh_cache() when updating the user index for --only commits.
24979 builtin-commit: Clean up an unused variable and a debug fprintf().
24980 t7501-commit: Add test for git commit <file> with dirty index.
24981 builtin-commit: Include the diff in the commit message when verbose.
24982 Fix off-by-one error when truncating the diff out of the commit message.
24983 Use a strbuf for copying the command line for the reflog.
24984 Rewrite builtin-fetch option parsing to use parse_options().
24986 Kristof Provost (1):
24987 makefile: Add a cscope target
24990 git-svn: add support for --first-parent
24991 git-svn: always use --first-parent
24992 Add test-script for git-merge porcelain
24993 git-merge: fix faulty SQUASH_MSG
24994 git-merge: refactor option parsing
24995 git-merge: add support for branch.<name>.mergeoptions
24996 git-merge: add support for --commit and --no-squash
24997 git-merge: add --ff and --no-ff options
24998 Make merge-recursive honor diff.renamelimit
24999 Teach git-pull about --[no-]ff, --no-squash and --commit
25000 for-each-ref: fix setup of option-parsing for --sort
25003 Speedup scanning for excluded files.
25005 Linus Torvalds (18):
25006 optimize diffcore-delta by sorting hash entries.
25007 Add 'diffcore.h' to LIB_H
25008 Split out "exact content match" phase of rename detection
25009 Ref-count the filespecs used by diffcore
25010 copy vs rename detection: avoid unnecessary O(n*m) loops
25011 Do linear-time/space rename logic for exact renames
25012 Do exact rename detection regardless of rename limits
25013 Fix ugly magic special case in exact rename detection
25014 Do the fuzzy rename detection limits with the exact renames removed
25015 Simplify topo-sort logic
25016 Add "--early-output" log flag for interactive GUI use
25017 Enhance --early-output format
25018 revision walker: mini clean-up
25019 Fix rev-list when showing objects involving submodules
25020 Fix parent rewriting in --early-output
25021 Fix a pathological case in git detecting proper renames
25022 Fix a pathological case in git detecting proper renames
25023 "git tag -u keyname" broken
25026 gitweb: speed up project listing on large work trees by limiting find depth
25028 Marius Storm-Olsen (2):
25029 Add 'git-p4 commit' as an alias for 'git-p4 submit'
25030 Teach core.autocrlf to 'git blame'
25033 git-submodule - allow a relative path as the subproject url
25036 Move convert-objects to contrib.
25037 rebase -i: create .dotest-merge after validating options.
25039 Matthias Kestenholz (1):
25040 Documentation: add --patch option to synopsis of git-add
25042 Michael Gebetsroither (1):
25043 hg-to-git speedup through selectable repack intervals
25045 Michael W. Olson (2):
25046 git-rebase--interactive.sh: Quote arguments to test
25047 Documentation/git-tag.txt: Document how to backdate tags
25049 Michael Witten (2):
25050 git-cvsexportcommit.perl: git-apply no longer needs --binary
25051 git-cvsserver runs hooks/post-receive
25053 Michal Vitecek (1):
25054 Don't use "<unknown>" for placeholders and suppress printing of empty user formats.
25056 Michele Ballabio (7):
25057 git-gui: remove dots in some UI strings
25058 git-gui: add some strings to translation
25059 git-gui: fix typo in lib/blame.tcl
25060 git-gui: update Italian translation
25061 test-lib.sh: move error line after error() declaration
25062 git-gui: fix a typo in lib/commit.tcl
25063 git-gui: update it.po and glossary/it.po
25066 instaweb: allow for use of auto-generated scripts
25067 instaweb: support for Ruby's WEBrick server
25070 Reuse previous annotation when overwriting a tag
25071 Add tests for git tag
25072 Refactor working tree setup
25073 Use setup_work_tree() in builtin-ls-files.c
25074 Don't always require working tree for git-rm
25075 Make git-blame fail when working tree is needed and we're not in one
25076 Small code readability improvement in show_reference() in builtin-tag.c
25077 Do git reset --hard HEAD when using git rebase --skip
25078 Fix and improve t7004 (git-tag tests)
25079 git-send-email.perl: Really add angle brackets to In-Reply-To if necessary
25080 Cleanup variables in http.[ch]
25081 Fix small memory leaks induced by diff_tree_setup_paths
25082 Fix XML parser leaks in http-push
25085 Hungarian translation of git-gui
25086 git-send-email: add a new sendemail.to configuration variable
25087 Include diff options in the git-log manpage
25088 Update Hungarian translation. 100% completed.
25090 Nanako Shiraishi (3):
25091 Japanese translation of git-gui
25092 git-gui: Update Japanese strings
25093 Update ja.po for git-gui
25095 Nguyễn Thái Ngọc Duy (3):
25096 contrib/fast-import: add simple shell example
25097 git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK
25098 Remove repo version check from setup_git_directory
25100 Nicolas Pitre (42):
25101 straighten the list of objects to deltify
25102 localize window memory usage accounting
25103 rearrange delta search progress reporting
25104 basic threaded delta search
25105 threaded delta search: refine work allocation
25106 threaded delta search: better chunck split point
25107 threaded delta search: specify number of threads at run time
25108 fix threaded delta search locking
25109 threaded delta search: add pack.threads config variable
25110 threaded delta search: proper locking for cache accounting
25111 more compact progress display
25112 cope with multiple line breaks within sideband progress messages
25113 pack-objects: no delta possible with only one object in the list
25114 pack-objects.c: fix some global variable abuse and memory leaks
25115 fix const issues with some functions
25116 fix for more minor memory leaks
25117 prune-packed: don't call display_progress() for every file
25118 make struct progress an opaque type
25119 relax usage of the progress API
25120 add throughput to progress display
25121 add throughput display to index-pack
25122 add some copyright notice to the progress display code
25123 add throughput display to git-push
25124 return the prune-packed progress display to the inner loop
25125 make sure throughput display gets updated even if progress doesn't move
25126 Show total transferred as part of throughput progress
25127 make the pack index version configurable
25128 pack-objects: get rid of an ugly cast
25129 git-fetch: more terse fetch output
25130 fix display overlap between remote and local progress
25131 sideband.c: ESC is spelled '\033' not '\e' for portability.
25132 make display of total transferred more accurate
25133 remove dead code from the csum-file interface
25134 restore fetching with thin-pack capability
25135 make display of total transferred fully accurate
25136 nicer display of thin pack completion
25137 add a howto document about corrupted blob recovery
25138 rehabilitate some t5302 tests on 32-bit off_t machines
25139 pack-objects: fix delta cache size accounting
25140 pack-objects: reverse the delta search sort list
25141 pack-objects: fix threaded load balancing
25142 pack-objects: more threaded load balancing fix with often changed paths
25144 Paolo Ciarrocchi (1):
25145 Italian translation of git-gui
25148 git-stash: do not get fooled with "color.diff = true"
25149 Set OLD_ICONV on Cygwin.
25151 Paul Mackerras (37):
25152 gitk: Establish and use global left-to-right ordering for commits
25153 gitk: Improve the drawing of links to parent lines
25154 gitk: Eliminate diagonal arrows
25155 gitk: Get rid of idrowranges and rowrangelist
25156 gitk: Get rid of idinlist array
25157 gitk: Fix some problems with the display of ids as links
25158 gitk: Get rid of the rowchk array
25159 gitk: Do only the parts of the layout that are needed
25160 gitk: Fix bug causing incorrect ref list contents when switching view
25161 gitk: Fix bug causing undefined variable error when cherry-picking
25162 gitk: Add a cache for the topology info
25163 gitk: Make it possible to lay out all the rows we have received so far
25164 gitk: Fix bugs in setting rowfinal
25165 gitk: Get rid of lookingforhead, use commitinterest instead
25166 gitk: Fix bug in generating patches
25167 gitk: Simplify highlighting interface and combine with Find function
25168 gitk: Fix a couple of bugs
25169 gitk: Add progress bars for reading in stuff and for finding
25170 gitk: Fix the tab setting in the diff display window
25171 gitk: Fix bug causing Tcl error when changing find match type
25172 gitk: Use named fonts instead of the font specification
25173 gitk: Keep track of font attributes ourselves instead of using font actual
25174 gitk: Add a font chooser
25175 gitk: Fix bug where the last few commits would sometimes not be visible
25176 gitk: Get rid of the diffopts variable
25177 gitk: Fix Tcl error: can't unset findcurline
25178 gitk: Check that we are running on at least Tcl/Tk 8.4
25179 gitk: Avoid an error when cherry-picking if HEAD has moved on
25180 gitk: Fix "can't unset prevlines(...)" Tcl error
25181 gitk: Limit diff display to listed paths by default
25182 gitk: Ensure tabstop setting gets restored by Cancel button
25183 gitk: Integrate the reset progress bar in the main frame
25184 gitk: Use the status window for other functions
25185 gitk: Fix some bugs with path limiting in the diff display
25186 gitk: Fix a couple more bugs in the path limiting
25187 gitk: Simplify the code for finding commits
25188 gitk: Use the UI font for the diff/old version/new version radio buttons
25190 Pierre Habouzit (80):
25191 Rework strbuf API and semantics.
25192 Simplify strbuf uses in archive-tar.c using strbuf API
25193 fast-import: Use strbuf API, and simplify cmd_data()
25194 mktree: Simplify write_tree() using strbuf API
25195 Use strbuf API in apply, blame, commit-tree and diff
25196 Use strbuf API in buitin-rerere.c
25197 Use strbuf API in cache-tree.c
25198 Strbuf API extensions and fixes.
25199 Change semantics of interpolate to work like snprintf.
25200 Rework pretty_print_commit to use strbufs instead of custom buffers.
25201 Use strbuf_read in builtin-fetch-tool.c.
25202 Use strbufs to in read_message (imap-send.c), custom buffer--.
25203 Replace all read_fd use with strbuf_read, and get rid of it.
25204 New strbuf APIs: splice and attach.
25205 Rewrite convert_to_{git,working_tree} to use strbuf's.
25206 Now that cache.h needs strbuf.h, remove useless includes.
25207 builtin-apply: use strbuf's instead of buffer_desc's.
25208 Refactor replace_encoding_header.
25209 Remove preemptive allocations.
25210 Drop strbuf's 'eof' marker, and make read_line a first class citizen.
25211 fast-import was using dbuf's, replace them with strbuf's.
25212 fast-import optimization:
25213 Add xmemdupz() that duplicates a block of memory, and NUL terminates it.
25214 Use xmemdupz() in many places.
25215 Fix the expansion pattern of the pseudo-static path buffer.
25216 nfv?asprintf are broken without va_copy, workaround them.
25217 strbuf API additions and enhancements.
25218 Rework unquote_c_style to work on a strbuf.
25219 Full rework of quote_c_style and write_name_quoted.
25220 sq_quote_argv and add_to_string rework with strbuf's.
25222 Make builtin-rerere use of strbuf nicer and more efficient.
25223 Small cache_tree_write refactor.
25224 double free in builtin-update-index.c
25225 strbuf change: be sure ->buf is never ever NULL.
25226 strbuf_read_file enhancement, and use it.
25227 Make read_patch_file work on a strbuf.
25228 Fix in-place editing functions in convert.c
25229 Add some fancy colors in the test library when terminal supports it.
25230 Support a --quiet option in the test-suite.
25231 fast-import.c: fix regression due to strbuf conversion
25232 Add a simple option parser.
25233 parse-options: be able to generate usages automatically
25234 parse-options: make some arguments optional, add callbacks.
25235 Add shortcuts for very often used options.
25236 parse-options: allow callbacks to take no arguments at all.
25237 Make builtin-rm.c use parse_options.
25238 Make builtin-mv.c use parse-options
25239 Make builtin-branch.c use parse_options.
25240 Make builtin-describe.c use parse_options
25241 Make builtin-revert.c use parse_options.
25242 Make builtin-update-ref.c use parse_options
25243 Make builtin-symbolic-ref.c use parse_options.
25244 Make builtin-for-each-ref.c use parse-opts.
25245 Make builtin-fsck.c use parse_options.
25246 Make builtin-count-objects.c use parse_options.
25247 Make builtin-name-rev.c use parse_options.
25248 Make builtin-pack-refs.c use parse_options.
25249 git-fetch: be even quieter.
25250 Some better parse-options documentation.
25251 Add a parseopt mode to git-rev-parse to bring parse-options to shell scripts.
25252 Update git-sh-setup(1) to allow transparent use of git-rev-parse --parseopt
25253 Migrate git-clean.sh to use git-rev-parse --parseopt.
25254 Migrate git-clone to use git-rev-parse --parseopt
25255 Migrate git-am.sh to use git-rev-parse --parseopt
25256 Migrate git-merge.sh to use git-rev-parse --parseopt
25257 Migrate git-instaweb.sh to use git-rev-parse --parseopt
25258 Migrate git-checkout.sh to use git-rev-parse --parseopt --keep-dashdash
25259 Migrate git-quiltimport.sh to use git-rev-parse --parseopt
25260 Migrate git-repack.sh to use git-rev-parse --parseopt
25261 sh-setup: don't let eval output to be shell-expanded.
25262 parse-options new features.
25263 Use OPT_SET_INT and OPT_BIT in builtin-branch
25264 Use OPT_BIT in builtin-for-each-ref
25265 Use OPT_BIT in builtin-pack-refs
25266 Make the diff_options bitfields be an unsigned with explicit masks.
25267 Reorder diff_opt_parse options more logically per topics.
25268 parse-options: Allow to hide options from the default usage.
25269 builtin-commit.c: export GIT_INDEX_FILE for launch_editor as well.
25270 Invert numbers and names in the git-shortlog summary mode.
25273 Open external merge tool with original file extensions for all three files
25275 Ralf Wildenhues (10):
25276 manual: Fix or remove em dashes.
25277 Fix some typos, punctuation, missing words, minor markup.
25278 Fix wording in push definition.
25279 manual: Fix example finding commits referencing given content.
25280 manual: add some markup.
25281 manual: use 'URL' instead of 'url'.
25282 git-cherry-pick: improve description of -x.
25283 Fix minor nits in configure.ac
25284 git-bisect.sh: Fix sed script to work with AIX and BSD sed.
25285 Document all help keys in "git add -i" patch mode.
25288 Export format_commit_message()
25289 archive: specfile support (--pretty=format: in archive files)
25290 Remove unused function convert_sha1_file()
25292 archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLDR" (take 2)
25293 archive: rename attribute specfile to export-subst
25294 archive: fix subst file generation
25295 Correct some sizeof(size_t) != sizeof(unsigned long) typing errors
25297 --pretty=format: on-demand format expansion
25298 --pretty=format: parse commit message only once
25299 add strbuf_adddup()
25300 --format=pretty: avoid calculating expensive expansions twice
25303 Define NO_MEMMEM of FreeBSD as it lacks the function
25305 Robert Schiele (2):
25306 git-gui: install-sh from automake does not like -m755
25307 install-sh from automake does not like -m without delimiting space
25309 Robin Rosenberg (1):
25310 cvsexportcommit: Add switch to specify CVS workdir
25313 git-svn: fix test for trunk svn (commit message not needed)
25314 git-svn: fix test for trunk svn (transaction out of date)
25315 git-svn: handle changed svn command-line syntax
25316 gitk: disable colours when calling git log
25317 Allow HTTP proxy to be overridden in config
25318 Add remote.<name>.proxy
25320 Scott R Parish (7):
25321 "git" returns 1; "git help" and "git help -a" return 0
25322 remove unused/unneeded "pattern" argument of list_commands
25323 "current_exec_path" is a misleading name, use "argv_exec_path"
25324 list_commands(): simplify code by using chdir()
25325 use only the $PATH for exec'ing git commands
25326 include $PATH in generating list of commands for "help -a"
25327 shell should call the new setup_path() to setup $PATH
25329 Sergei Organov (7):
25330 core-tutorial.txt: Fix git-show-branch example and its description
25331 user-manual.txt: fix a few mistakes
25332 user-manual: minor rewording for clarity.
25333 Documentation: customize diff-options depending on particular command
25334 user-manual.txt: minor clarification.
25335 Documentation: fix git-clone manpage not to refer to itself
25336 Let git-help prefer man-pages installed with this version of git
25339 Add more tests for git-clean
25340 Make git-clean a builtin
25341 Teach git clean to use setup_standard_excludes()
25342 Make git status usage say git status instead of git commit
25344 Shawn O. Pearce (106):
25345 git-gui: Locate the library directory early during startup
25346 git-gui: Initialize Tcl's msgcat library for internationalization
25347 git-gui: Update po/README as symlink process is not necessary
25348 git-gui: Correct stock message for 'Invalid font specified in %s'
25349 git-gui: Quiet the msgfmt part of the make process
25350 git-gui: Ensure msgfmt failure stops GNU make
25351 Define NO_MEMMEM on Darwin as it lacks the function
25352 git-gui: Mark revision chooser tooltip for translation
25353 git-gui: Localize commit/author dates when displaying them
25354 git-gui: Support context-sensitive i18n
25355 git-gui: Document the new i18n context support
25356 git-gui: Make the tree browser also use lightgray selection
25357 git-gui: Paper bag fix missing translated strings
25358 Correct builtin-fetch to handle + in refspecs
25359 Fix off by one bug in reflog messages written by builtin-fetch
25360 Remove unnecessary debugging from builtin-fetch
25361 Remove unused unpacklimit variable from builtin-fetch
25362 Replace custom memory growth allocator with ALLOC_GROW
25363 Simplify fetch transport API to just one function
25364 Refactor index-pack "keep $sha1" handling for reuse
25365 Remove pack.keep after ref updates in git-fetch
25366 Always ensure the pack.keep file is removed by git-fetch
25367 Fix builtin-fetch memory corruption by not overstepping array
25368 Backup the array passed to fetch_pack so we can free items
25369 Properly cleanup in http_cleanup so builtin-fetch does not segfault
25370 Don't bother passing ref log details to walker in builtin-fetch
25371 Cleanup duplicate initialization code in transport_get
25372 Add transport.h to LIB_H as transport.o is in LIB_OBJS
25373 Remove unnecessary 'fetch' argument from transport_get API
25374 Allow builtin-fetch to work on a detached HEAD
25375 Don't configure remote "." to fetch everything to itself
25376 Remove more debugging from builtin-fetch
25377 builtin-fetch: Don't segfault on "fetch +foo"
25378 Don't attempt to merge non-existant remotes in t5515
25379 Correct handling of branch.$name.merge in builtin-fetch
25380 Avoid printing unnecessary warnings during fetch and push
25381 Use 'unsigned:1' when we mean boolean options
25382 Rename remote.uri to remote.url within remote handling internals
25383 Refactor struct transport_ops inlined into struct transport
25384 Always obtain fetch-pack arguments from struct fetch_pack_args
25385 Ensure builtin-fetch honors {fetch,transfer}.unpackLimit
25386 Fix memory leaks when disconnecting transport instances
25387 git-gui: Fix missing i18n markup in push/fetch windows
25388 git-gui: Support native Win32 Tcl/Tk under Cygwin
25389 git-gui: Refactor some UI init to occur earlier
25390 git-gui: Allow users to choose/create/clone a repository
25391 git-gui: Avoid console scrollbars unless they are necessary
25392 git-gui: Don't bother showing OS error message about hardlinks
25393 git-gui: Keep the UI responsive while counting objects in clone
25394 git-gui: Copy objects/info/alternates during standard clone
25395 Cleanup style nit of 'x == NULL' in remote.c
25396 Cleanup unnecessary break in remote.c
25397 Prevent send-pack from segfaulting when a branch doesn't match
25398 git-gui: Don't delete console window namespaces too early
25399 git-gui: Don't delete scrollbars in console windows
25400 git-gui: Switch the git-gui logo to Henrik Nyh's logo
25401 git-gui: Make the status bar easier to read in the setup wizard
25402 git-gui: Use Henrik Nyh's git logo icon on Windows systems
25403 git-gui: Support a native Mac OS X application bundle
25404 git-gui: Refer to ourselves as "Git Gui" and not "git-gui"
25405 git-gui: Allow forced push into remote repository
25406 git-gui: Refactor Henrik Nyh's logo into its own procedure
25407 git-gui: Refactor about dialog code into its own module
25408 git-gui: Include our Git logo in the about dialog
25409 git-gui: Use progress meter in the status bar during index updates
25410 git-gui: Consolidate the Fetch and Push menus into a Remote menu
25411 git-gui: Bind Cmd-, to Preferences on Mac OS X
25412 git-gui: Shorten the staged/unstaged changes title bar text
25413 git-gui: Updated po strings based on current sources
25414 git-gui: Move load_config procedure below git-version selection
25415 git-gui: Refactor git-config --list parsing
25416 git-gui: Support LFs embedded in config file values
25417 git-gui: Change repository browser radio buttons to hyperlinks
25418 git-gui: Offer repository management features in menu bar
25419 git-gui: Fix bind errors when switching repository chooser panels
25420 git-gui: Disable the text widget in the repository chooser
25421 git-gui: Bind n/c/o accelerators in repository chooser
25422 git-gui: Ensure copyright message is correctly read as UTF-8
25423 git-gui: Use proper Windows shortcuts instead of bat files
25424 git-gui: Support cloning Cygwin based work-dirs
25425 git-gui: Collapse $env(HOME) to ~/ in recent repositories on Windows
25426 git-gui: Honor a config.mak in git-gui's top level
25427 Fix 'push --all branch...' error handling
25428 Support 'push --dry-run' for rsync transport
25429 Support 'push --dry-run' for http transport
25430 git-gui: Paper bag fix the global config parsing
25431 Change 'Deltifying objects' to 'Compressing objects'
25432 Teach prune-packed to use the standard progress meter
25433 Stop displaying "Pack pack-$ID created." during git-gc
25434 Avoid scary errors about tagged trees/blobs during git-fetch
25435 Define compat version of mkdtemp for systems lacking it
25436 Improved const correctness for strings
25437 Use PRIuMAX instead of 'unsigned long long' in show-index
25438 git-gui: Make sure we get errors from git-update-index
25439 git-gui: Protect against bad translation strings
25440 git-gui: Allow users to set font weights to bold
25441 Reteach builtin-ls-remote to understand remotes
25442 git-gui: Bind Meta-T for "Stage To Commit" menu action
25443 git-fetch: Always fetch tags if the object they reference exists
25444 run-command: Support sending stderr to /dev/null
25445 rev-list: Introduce --quiet to avoid /dev/null redirects
25446 git-fetch: avoid local fetching from alternate (again)
25447 Handle broken vsnprintf implementations in strbuf
25448 Fix warning about bitfield in struct ref
25450 Remove git-status from list of scripts as it is builtin
25452 Simon Hausmann (10):
25453 git-p4: Always call 'p4 sync ...' before submitting to Perforce.
25454 git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user.
25455 git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a list of given depot paths into a standalone method.
25456 git-p4: Cleanup; moved the code to import a list of p4 changes using fast-import into a separate member function of P4Sync.
25457 git-p4: Cleanup; Turn self.revision into a function local variable (it's not used anywhere outside the function).
25458 git-p4: Cleanup; moved the code for the initial #head or revision import into a separate function, out of P4Sync.run.
25459 git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method.
25460 git-p4: Added support for automatically importing newly appearing perforce branches.
25461 git-p4: When skipping a patch as part of "git-p4 submit" make sure we correctly revert to the previous state of the files using "p4 revert".
25462 git-p4: Fix direct import from perforce after fetching changes through git from origin
25465 Make mailsplit and mailinfo strip whitespace from the start of the input
25467 Stefan Sperling (1):
25468 Fix pool handling in git-svnimport to avoid memory leaks.
25470 Steffen Prohaska (16):
25471 git-gui: add directory git-gui is located in to PATH (on Windows)
25472 git-gui: set NO_MSGFMT to force using pure tcl replacement in msysgit
25473 git-gui: add mingw specific startup wrapper
25474 git-gui: offer a list of recent repositories on startup
25475 mergetool: use path to mergetool in config var mergetool.<tool>.path
25476 mergetool: add support for ECMerge
25477 mergetool: avoid misleading message "Resetting to default..."
25478 Fix comment in strbuf.h to use correct name strbuf_avail()
25479 push: mention --verbose option in documentation
25480 push: teach push to pass --verbose option to transport layer
25481 push: support pushing HEAD to real branch name
25482 add refname_match()
25483 push: use same rules as git-rev-parse to resolve refspecs
25484 refactor fetch's ref matching to use refname_match()
25485 Use is_absolute_path() in diff-lib.c, lockfile.c, setup.c, trace.c
25486 sha1_file.c: Fix size_t related printf format warnings
25489 Add a message explaining that automatic GC is about to start
25490 builtin-fetch: Add "-q" as a synonym for "--quiet"
25491 git-svn: Don't create a "master" branch every time rebase is run
25494 Don't checkout the full tree if avoidable
25497 Make the list of common commands more exclusive
25498 Remove hint to use "git help -a"
25500 Thomas Harning (1):
25501 git-merge-ours: make it a builtin.
25503 Uwe Kleine-König (1):
25504 send-email: apply --suppress-from to S-o-b and cc-cmd
25507 git-svn: add a show-externals command.
25510 Added a test for fetching remote tags when there is not tags.
25512 Wincent Colaiuta (21):
25513 Further clarify clean.requireForce changes
25514 Authenticate only once in git-send-email
25515 Refactor patch_update_cmd
25516 Teach builtin-add to pass multiple paths to git-add--interactive
25517 Add path-limiting to git-add--interactive
25518 Add "--patch" option to git-add--interactive
25519 Fix typo in draft 1.5.4 release notes
25520 Highlight keyboard shortcuts in git-add--interactive
25521 revert/cherry-pick: Allow overriding the help text by the calling Porcelain
25522 add -i: allow prefix highlighting for "Add untracked" as well.
25523 git-add -i: add help text for list-and-choose UI
25524 Silence iconv warnings on Leopard
25525 Teach "git add -i" to colorize whitespace errors
25526 Allow --no-verify to bypass commit-msg hook
25527 Documentation: fix --no-verify documentation for "git commit"
25528 Add tests for pre-commit and commit-msg hooks
25529 Interactive editor tests for commit-msg hook
25530 Style fixes for pre-commit hook tests
25531 Use "whitespace" consistently
25532 Documentation: minor grammar fix for "git apply"
25533 Fix "diff --check" whitespace detection
25536 Initial Chinese translation for git-gui
25537 git-gui: Added initial version of po/glossary/zh_cn.po
25540 gitweb: use Perl built-in utf8 function for UTF-8 decoding.
25543 Version v1.5.3.8; changes since v1.5.3.7:
25544 -----------------------------------------
25547 Change from using email.com to example.com as example domain, as per RFC 2606.
25550 git-svn: support for funky branch and project names over HTTP(S)
25551 git-svn: clarify the "Ignoring error from SVN" piece
25554 t9600: test cvsimport from CVS working tree
25555 clone: correctly report http_fetch errors
25556 git-send-email: avoid duplicate message-ids
25559 config.c:store_write_pair(): don't read the byte before a malloc'd buffer.
25561 Junio C Hamano (3):
25562 git grep shows the same hit repeatedly for unmerged paths
25563 git-am -i: report rewritten title
25566 Nguyễn Thái Ngọc Duy (3):
25567 Add missing inside_work_tree setting in setup_git_directory_gently
25568 Do check_repository_format() early
25569 Do check_repository_format() early (re-fix)
25572 Version v1.5.3.7; changes since v1.5.3.6:
25573 -----------------------------------------
25575 Björn Steinbrink (3):
25576 git-commit.sh: Fix usage checks regarding paths given when they do not make sense
25577 t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
25578 git-commit: Add tests for invalid usage of -a/--interactive with paths
25581 config: correct core.loosecompression documentation
25582 config: clarify compression defaults
25584 J. Bruce Fields (7):
25585 git-remote.txt: fix example url
25586 user-manual: mention "..." in "Generating diffs", etc.
25587 Documentation: Fix references to deprecated commands
25588 user-manual: define "branch" and "working tree" at start
25589 user-manual: failed push to public repository
25590 user-manual: clarify language about "modifying" old commits
25591 user-manual: recovering from corruption
25594 Improve description of git-branch -d and -D in man page.
25597 send-email: add transfer encoding header with content-type
25598 Add basic cvsimport tests
25599 cvsimport: use rev-parse to support packed refs
25600 cvsimport: miscellaneous packed-ref fixes
25601 cvsimport: fix usage of cvsimport.module
25603 Johannes Schindelin (2):
25604 bundle create: keep symbolic refs' names instead of resolving them
25605 Replace the word 'update-cache' by 'update-index' everywhere
25608 t7003-filter-branch: Fix test of a failing --msg-filter.
25610 Junio C Hamano (11):
25611 format-patch -s: add MIME encoding header if signer's name requires so
25612 test format-patch -s: make sure MIME content type is shown as needed
25613 ce_match_stat, run_diff_files: use symbolic constants for readability
25614 git-add: make the entry stat-clean after re-adding the same contents
25615 t2200: test more cases of "add -u"
25616 Make test scripts executable.
25617 Fix sample pre-commit hook
25618 git-checkout: describe detached head correctly
25619 scripts: do not get confused with HEAD in work tree
25620 Fix typo in t4008 test title
25623 Linus Torvalds (1):
25624 Fix rev-list when showing objects involving submodules
25627 Doc fix for git-reflog: mention @{...} syntax, and <ref> in synopsys.
25630 Make GIT_INDEX_FILE apply to git-commit
25632 Steffen Prohaska (1):
25633 user-manual: Add section "Why bisecting merge commits can be harder ..."
25636 Version v1.5.3.6; changes since v1.5.3.5:
25637 -----------------------------------------
25640 stop t1400 hiding errors in tests
25642 Ask Bjørn Hansen (1):
25643 When exec() fails include the failing command in the error message
25645 Benoit Sigoure (2):
25646 git-send-email: Change the prompt for the subject of the initial message.
25647 git-svn: prevent dcommitting if the index is dirty.
25650 cvsexportcommit: fix for commits that do not have parents
25652 Christian Couder (1):
25653 for-each-ref: fix off by one read.
25655 David D. Kilzer (2):
25656 RelNotes-1.5.3.5: fix typo
25657 RelNotes-1.5.3.5: fix another typo
25660 Improve accuracy of check for presence of deflateBound.
25663 git-svn: fix dcommit clobbering when committing a series of diffs
25664 git-svn: t9114: verify merge commit message in test
25667 git-diff.txt: add section "output format" describing the diff formats
25668 git-cvsimport: really convert underscores in branch names to dots with -u
25669 git-daemon: fix remote port number in log entry
25670 git-mailsplit: with maildirs not only process cur/, but also new/
25672 Jakub Narębski (1):
25673 gitweb: Update config file example for snapshot feature in gitweb/INSTALL
25676 git-branch: remove mention of non-existent '-b' option
25677 git-send-email: add charset header if we add encoded 'From'
25680 replace reference to git-rm with git-reset in git-commit doc
25682 Johannes Schindelin (1):
25683 Add Documentation/CodingGuidelines
25686 Remove escaping of '|' in manpage option sections
25687 instaweb: Minor cleanups and fixes for potential problems
25688 Documentation: Fix man page breakage with DocBook XSL v1.72
25690 Jonathan del Strother (1):
25691 Fixing path quoting in git-rebase
25693 Junio C Hamano (12):
25694 grep with unmerged index
25695 refresh_index_quietly(): express "optional" nature of index writing better
25696 Makefile: add missing dependency on wt-status.h
25697 Start preparing for 1.5.3.6
25698 t/t3404: fix test for a bogus todo file.
25699 revert/cherry-pick: allow starting from dirty work tree.
25700 git-clean: honor core.excludesfile
25701 core.excludesfile clean-up
25702 Fix per-directory exclude handing for "git add"
25703 Update draft release notes for 1.5.3.6
25704 grep -An -Bm: fix invocation of external grep command
25707 Kristian Høgsberg (1):
25708 Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.
25710 Marco Costalba (1):
25711 Remove a couple of duplicated include
25714 Delay pager setup in git blame
25717 print warning/error/fatal messages in one shot
25718 git-hash-object should honor config variables
25719 fix index-pack with packs >4GB containing deltas on 32-bit machines
25721 Ralf Wildenhues (3):
25722 git-clone.txt: Improve --depth description.
25723 Avoid a few unportable, needlessly nested "...`...".
25724 Fix sed string regex escaping in module_name.
25726 Sergei Organov (6):
25727 git-filter-branch.txt: fix a typo.
25728 git-format-patch.txt: fix explanation of an example.
25729 Documentation: quote commit messages consistently.
25730 SubmittingPatches: improve the 'Patch:' section of the checklist
25731 core-tutorial.txt: Fix argument mistake in an example.
25732 git-remote.txt: fix typo
25734 Shawn O. Pearce (2):
25735 Fix memory leak in traverse_commit_list
25736 Don't allow fast-import tree delta chains to exceed maximum depth
25738 Vincent Zanotti (1):
25739 gitweb: correct month in date display for atom feeds
25741 Wincent Colaiuta (2):
25742 Grammar fixes for gitattributes documentation
25743 Fix t9101 test failure caused by Subversion "auto-props"
25746 Version v1.5.3.5; changes since v1.5.3.4:
25747 -----------------------------------------
25750 Ensure we add directories in the correct order
25753 Fix generation of perl/perl.mak
25755 Andrew Clausen (1):
25756 helpful error message when send-pack finds no refs in common.
25758 Aurelien Bompard (1):
25759 honor the http.sslVerify option in shell scripts
25761 Benoit Sigoure (1):
25762 Fix a small memory leak in builtin-add
25764 Björn Steinbrink (3):
25765 Fix --strategy parsing in git-rebase--interactive.sh
25766 git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
25767 git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
25769 Brian Gernhardt (1):
25770 cvsserver: Use exit 1 instead of die when req_Root fails.
25772 Frank Lichtenheld (1):
25773 git-config: don't silently ignore options after --list
25776 git-config: handle --file option with relative pathname properly
25777 git-config: print error message if the config file cannot be read
25779 Jean-Luc Herren (2):
25780 git add -i: Fix parsing of abbreviated hunk headers
25781 git add -i: Remove unused variables
25784 send-pack: respect '+' on wildcard refspecs
25786 Joakim Tjernlund (1):
25787 Improve receive-pack error message about funny ref creation
25789 Johannes Schindelin (5):
25790 clear_commit_marks(): avoid deep recursion
25791 rebase -i: use diff plumbing instead of porcelain
25792 Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE
25793 fix filter-branch documentation
25794 filter-branch: update current branch when rewritten
25796 Julian Phillips (1):
25797 fast-import: Fix argument order to die in file_change_m
25799 Junio C Hamano (8):
25800 git-remote: fix "Use of uninitialized value in string ne"
25801 sha1_file.c: avoid gcc signed overflow warnings
25802 merge-recursive.c: mrtree in merge() is not used before set
25803 RelNotes-1.5.3.5: describe recent fixes
25804 Prevent send-pack from segfaulting (backport from 'master')
25805 git-merge: document but discourage the historical syntax
25806 Update GIT 1.5.3.5 Release Notes
25810 Make merge-recursive honor diff.renamelimit
25812 Linus Torvalds (6):
25813 Fix embarrassing "git log --follow" bug
25814 Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
25815 git-blame shouldn't crash if run in an unmerged tree
25816 Avoid scary errors about tagged trees/blobs during git-fetch
25817 Fix directory scanner to correctly ignore files without d_type
25818 Fix diffcore-break total breakage
25820 Mathias Megyei (1):
25821 Do not remove distributed configure script
25823 Michael W. Olson (1):
25824 Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example
25826 Michele Ballabio (2):
25827 git-reflog: document --verbose
25828 git-archive: document --exec
25831 cherry-pick/revert: more compact user direction message
25833 Patrick Welche (1):
25834 Define NI_MAXSERV if not defined by operating system
25836 Ralf Wildenhues (1):
25837 gitk.txt: Fix markup.
25839 Robert Schiele (1):
25840 fixing output of non-fast-forward output of post-receive-email
25842 Sergei Organov (1):
25843 core-tutorial: Use new syntax for git-merge.
25845 Shawn O. Pearce (17):
25846 git-gui: Display message box when we cannot find git in $PATH
25847 git-gui: Handle starting on mapped shares under Cygwin
25848 git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs
25849 git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk
25850 git-gui: Don't crash when starting gitk from a browser session
25851 Whip post 1.5.3.4 maintenance series into shape.
25852 Correct typos in release notes for 1.5.3.5
25853 Avoid 'expr index' on Mac OS X as it isn't supported
25854 Document additional 1.5.3.5 fixes in release notes
25855 Yet more 1.5.3.5 fixes mentioned in release notes
25856 Avoid invoking diff drivers during git-stash
25857 Further 1.5.3.5 fixes described in release notes
25858 Paper bag fix diff invocation in 'git stash show'
25859 git-gui: Correctly report failures from git-write-tree
25860 git-gui: Handle progress bars from newer gits
25861 git-gui: Don't display CR within console windows
25862 Describe more 1.5.3.5 fixes in release notes
25865 git-gui: Avoid using bold text in entire gui for some fonts
25867 Steffen Prohaska (2):
25868 git-gui: accept versions containing text annotations, like 1.5.3.mingw.1
25869 attr: fix segfault in gitattributes parsing code
25872 Version v1.5.3.4; changes since v1.5.3.3:
25873 -----------------------------------------
25876 post-receive-hook: Remove the From field from the generated email header so that the pusher's name is used
25879 Add test case for ls-files --with-tree
25881 Federico Mena Quintero (4):
25882 Say when --track is useful in the git-checkout docs.
25883 Add documentation for --track and --no-track to the git-branch docs.
25884 Note that git-branch will not automatically checkout the new branch
25885 Make git-pull complain and give advice when there is nothing to merge with
25888 git-remote: exit with non-zero status after detecting errors.
25890 Jean-Luc Herren (2):
25891 git-add--interactive: Allow Ctrl-D to exit
25892 git-add--interactive: Improve behavior on bogus input
25895 diffcore-rename: cache file deltas
25898 Mention 'cpio' dependency in INSTALL
25900 Johannes Schindelin (2):
25901 rebase -i: squash should retain the authorship of the _first_ commit
25902 Fix typo in config.txt
25904 Junio C Hamano (5):
25905 Whip post 1.5.3.3 maintenance series into shape.
25906 git-commit: initialize TMP_INDEX just to be sure.
25907 for-each-ref: fix %(numparent) and %(parent)
25908 rename diff_free_filespec_data_large() to diff_free_filespec_blob()
25912 Must not modify the_index.cache as it may be passed to realloc at some point.
25915 git stash: document apply's --index switch
25917 Robert Schiele (1):
25918 the ar tool is called gar on some systems
25920 Steffen Prohaska (1):
25921 fixed link in documentation of diff-options
25924 Version v1.5.3.3; changes since v1.5.3.2:
25925 -----------------------------------------
25928 Move make_cache_entry() from merge-recursive.c into read-cache.c
25931 quiltimport: Skip non-existent patches
25934 Detect exec bit in more cases.
25937 Supplant the "while case ... break ;; esac" idiom
25940 git-svn: don't attempt to spawn pager if we don't want one
25943 Fixed minor typo in t/t9001-send-email.sh test command line.
25945 J. Bruce Fields (1):
25946 user-manual: don't assume refs are stored under .git/refs
25948 Jakub Narębski (2):
25949 gitweb: Remove parse_from_to_diffinfo code from git_patchset_body
25950 gitweb: No difftree output for trivial merge
25953 unexpected Make output (e.g. from --debug) causes build failure
25954 Do not over-quote the -f envelopesender value.
25956 Johannes Schindelin (1):
25957 apply: get rid of --index-info in favor of --build-fake-ancestor
25960 gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' interaction.
25961 gitattributes.txt: Be more to the point in the filter driver description.
25963 Junio C Hamano (3):
25964 Documentation/git-lost-found.txt: drop unnecessarily duplicated name.
25965 Mergetool generating blank files (1.5.3)
25968 Linus Torvalds (1):
25969 Fix revision log diff setup, avoid unnecessary diff generation
25972 Move the paragraph specifying where the .idx and .pack files should be
25973 Conjugate "search" correctly in the git-prune-packed man page.
25976 user-manual: Explain what submodules are good for.
25979 User Manual: add a chapter for submodules
25980 git-bundle: fix commandline examples in the manpage
25983 core-tutorial: correct URL
25986 Fix spelling of overridden in documentation
25989 mergetool: fix emerge when running in a subdirectory
25990 mergetool: Fix typo in options passed to kdiff3
25993 Version v1.5.3.2; changes since v1.5.3.1:
25994 -----------------------------------------
25996 Alexandre Julliard (1):
25997 hooks--update: Explicitly check for all zeros for a deleted ref.
25999 Benoit Sigoure (1):
26000 Add test to check recent fix to "git add -u"
26003 git-tag -s must fail if gpg cannot sign the tag.
26006 git-send-email.perl: Add angle brackets to In-Reply-To if necessary
26008 Dmitry V. Levin (2):
26009 Makefile: Add cache-tree.h to the headers list
26010 git-commit: Disallow amend if it is going to produce an empty non-merge commit
26013 git-svn: fix "Malformed network data" with svn:// servers
26014 git-svn: understand grafts when doing dcommit
26015 Documentation/git-svn: updated design philosophy notes
26018 git-gui: lib/index.tcl: handle files with % in the filename properly
26019 git-clone: improve error message if curl program is missing or not executable
26021 J. Bruce Fields (13):
26022 user-manual: adjust section levels in "git internals"
26023 user-manual: move object format details to hacking-git chapter
26024 user-manual: rename "git internals" to "git concepts"
26025 user-manual: create new "low-level git operations" chapter
26026 user-manual: rewrite index discussion
26027 user-manual: reorder commit, blob, tree discussion
26028 user-manual: rewrite object database discussion
26029 user-manual: move packfile and dangling object discussion
26030 user-manual: fix introduction to packfiles
26031 user-manual: todo updates and cleanup
26032 documentation: replace Discussion section by link to user-manual chapter
26033 core-tutorial: minor cleanup
26034 git-apply: fix whitespace stripping
26037 Documentation/git-archive.txt: a couple of clarifications.
26039 Jean-Luc Herren (1):
26040 stash: end index commit log with a newline
26043 git-push: documentation and tests for pushing only branches
26045 Johannes Schindelin (2):
26046 revision walker: --cherry-pick is a limited operation
26047 apply --index-info: fall back to current index for mode changes
26049 Junio C Hamano (13):
26050 git-apply: do not read past the end of buffer
26051 git-add -u: do not barf on type changes
26052 git-format-patch --in-reply-to: accept <message@id> with angle brackets
26053 diff --no-index: do not forget to run diff_setup_done()
26054 Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot
26055 Split grep arguments in a way that does not requires to add /dev/null.
26056 git-sh-setup: typofix in comments
26057 send-email: make message-id generation a bit more robust
26058 git-commit: Allow partial commit of file removal.
26059 git-commit: partial commit of paths only removed from the index
26060 Document ls-files --with-tree=<tree-ish>
26061 t/t4014: test "am -3" with mode-only change.
26064 Linus Torvalds (1):
26065 Fix the rename detection limit checking
26067 Matthias Urlichs (1):
26068 git-svnimport: Use separate arguments in the pipe for git-rev-parse
26071 (cvs|svn)import: Ask git-tag to overwrite old tags.
26073 Michele Ballabio (2):
26074 git-gui: show unstaged symlinks in diff viewer
26075 git-gui: handle "deleted symlink" diff marker
26078 Documentation / grammer nit
26081 fix doc for --compression argument to pack-objects
26083 Pierre Habouzit (1):
26084 Fix lapsus in builtin-apply.c
26086 Ramsay Allan Jones (1):
26087 Fix a test failure (t9500-*.sh) on cygwin
26089 Shawn O. Pearce (17):
26090 git-gui: Correct starting of git-remote to handle -w option
26091 git-gui: Fix detaching current branch during checkout
26092 git-gui: Properly set the state of "Stage/Unstage Hunk" action
26093 Don't allow contrib/workdir/git-new-workdir to trash existing dirs
26094 Cleanup unnecessary file modifications in t1400-update-ref
26095 Include a git-push example for creating a remote branch
26096 git-gui: Disable Tk send in all git-gui sessions
26097 git-gui: Avoid use of libdir in Makefile
26098 git-gui: Assume untracked directories are Git submodules
26099 git-gui: Trim trailing slashes from untracked submodule names
26100 Make --no-thin the default in git-push to save server resources
26101 git-gui: Don't delete send on Windows as it doesn't exist
26102 git-gui: Make backporting changes from i18n version easier
26103 git-gui: Font chooser to handle a large number of font families
26104 git-gui: Provide 'uninstall' Makefile target to undo an installation
26105 git-gui: Paper bag fix "Commit->Revert" format arguments
26106 git-gui: Disable native platform text selection in "lists"
26108 Sven Verdoolaege (1):
26109 git-diff: don't squelch the new SHA1 in submodule diffs
26111 Ulrik Sverdrup (1):
26112 Remove duplicate note about removing commits with git-filter-branch
26115 Fixed update-hook example allow-users format.
26118 Version v1.5.3.1; changes since v1.5.3:
26119 ---------------------------------------
26121 Junio C Hamano (2):
26122 Typofix: 1.5.3 release notes
26123 GIT 1.5.3.1: obsolete git-p4 in RPM spec file.
26126 Version v1.5.3; changes since v1.5.3-rc7:
26127 -----------------------------------------
26130 Temporary fix for stack smashing in mailinfo
26133 git-tag: Fix -l option to use better shell style globs.
26136 git-svn: fix dcommit clobbering upstream when committing multiple changes
26138 Giuseppe Bilotta (2):
26139 git-filter-branch: more detailed USAGE
26140 git-filter-branch: document --original option
26143 git-send-email --cc-cmd
26145 Johannes Schindelin (5):
26146 completion: also complete git-log's --left-right and --cherry-pick option
26147 filter-branch: fix remnants of old syntax in documentation
26148 rebase -i: mention the option to split commits in the man page
26149 filter-branch: provide the convenience functions also for commit filters
26150 filter-branch: introduce convenience function "skip_commit"
26153 rebase -m: Fix incorrect short-logs of already applied commits.
26155 Junio C Hamano (13):
26156 git-daemon(1): assorted improvements.
26157 ls-files --error-unmatch: do not barf if the same pattern is given twice.
26158 Makefile: do not allow gnu make to remove test-*.o files
26159 filter-branch: make sure orig_namespace ends with a single slash.
26160 git-init: autodetect core.symlinks
26161 Make "git-log --" without paths behave the same as "git-log" without --
26162 Hopefully the final update to draft release notes for 1.5.3.
26163 git-svn: Protect against "diff.color = true".
26164 git-diff: resurrect the traditional empty "diff --git" behaviour
26165 Avoid one-or-more (\+) non BRE in sed scripts.
26166 Documentation: minor AsciiDoc mark-up fixes.
26167 Update my contact address as the maintainer.
26171 URL: allow port specification in ssh:// URLs
26174 Make git-archimport log entries more consistent
26177 fix same sized delta logic
26179 Paul Mackerras (1):
26180 gitk: Fix bug causing undefined variable error when cherry-picking
26182 Robin Rosenberg (1):
26183 Mention -m as an abbreviation for --merge
26185 Shawn O. Pearce (1):
26186 Teach bash about completing arguments for git-tag
26189 Fixing comment in merge strategies
26192 Version v1.5.3-rc7; changes since v1.5.3-rc6:
26193 ---------------------------------------------
26196 Fix git-remote for ActiveState Perl
26198 Alexandre Julliard (1):
26199 git.el: Avoid a lisp error when there's no current branch (detached HEAD).
26202 Documentation: For consistency, use CVS instead of cvs.
26203 Documentation: Correct various misspellings and typos.
26204 Make usage documentation for git-am consistent.
26205 Make usage documentation for git-add consistent.
26206 When nothing to git-commit, honor the git-status color setting.
26209 diff-delta.c: Fix broken skip calculation.
26210 Documentation/user-manual.txt: fix a few omissions of gitlink commands.
26211 Documentation/user-manual.txt: fix a few omissions of gitlink commands.
26212 git-svn.txt: fix an obvious misspelling.
26215 git.el: Added colors for dark background
26218 git-svn: update documentation with CAVEATS section
26219 git-svn: dcommit prints out the URL to be committed to
26221 J. Bruce Fields (5):
26222 user-manual: edit "ignoring files" for conciseness
26223 user-manual: minor editing for conciseness
26224 user-manual: introduce the word "commit" earlier
26225 user-manual: use pithier example commit
26226 user-manual: fix incorrect header level
26228 Jakub Narębski (1):
26229 gitweb: Fix escaping HTML of project owner in 'projects_list' and 'summary' views
26232 git-tag(1): Remove duplicate text
26234 Johannes Schindelin (2):
26235 rebase -i: fix squashing corner case
26236 name-rev: Fix non-shortest description
26238 Junio C Hamano (11):
26239 blame: check return value from read_sha1_file()
26240 pack-objects: check return value from read_sha1_file()
26241 RelNotes draft for 1.5.3 update.
26242 Fix initialization of a bare repository
26243 git --bare cmd: do not unconditionally nuke GIT_DIR
26244 git-merge: do up-to-date check also for all strategies
26245 Porcelain level "log" family should recurse when diffing.
26246 "format-patch --root rev" is the way to show everything.
26247 Documentation/git-diff: A..B and A...B cannot take tree-ishes
26248 format-patch documentation: reword to hint "--root <one-commit>" more clearly
26251 Linus Torvalds (1):
26252 Fix racy-git handling in git-write-tree.
26255 Describe two-dot and three-dot notation for diff endpoints.
26258 gitweb: Fix searchbox positioning
26259 gitweb: Lift any characters restriction on searched strings
26260 git-add: Make the "tried to add ignored file" error message less confusing
26261 git-add: Make the filename globbing note a bit clearer
26264 Fix breakage in git-rev-list.txt
26267 Documentation: update tar.umask default
26269 Sean Estabrooks (1):
26270 Reset terminal attributes when terminating git send-email
26272 Shawn O. Pearce (13):
26273 git-gui: Fix window manager problems on ion3
26274 git-gui: Allow git-merge to use branch names in conflict markers
26275 git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu
26276 git-gui: Fix "unoptimized loading" to not cause git-gui to crash
26277 Fix new-workdir (again) to work on bare repositories
26278 Suggest unsetting core.bare when using new-workdir on a bare repository
26279 Update bash completion with new 1.5.3 command line options
26280 Teach bash to complete ref arguments to git-describe
26281 Teach bash about git-submodule and its subcommands
26282 git-gui: Refactor diff pane popup support for future improvements
26283 git-gui: Do not offer to stage three-way diff hunks into the index
26284 git-gui: Correct 'git gui blame' in a subdirectory
26285 Don't segfault if we failed to inflate a packed delta
26287 Simon Hausmann (2):
26288 git-p4: Make 'git-p4 branches' work after an initial clone with git clone from an origin-updated repository.
26289 git-p4: Fix warnings about non-existant refs/remotes/p4/HEAD ref when running git-p4 sync the first time after a git clone.
26291 Stefan Sperling (1):
26292 Document -u option in git-svnimport man page
26294 martin f. krafft (2):
26295 git-svn init/clone --stdlayout option to default-init trunk/tags/branches
26296 Install man3 manpages to $PREFIX/share/man/man3 even for site installs
26299 Version v1.5.3-rc6; changes since v1.5.3-rc5:
26300 ---------------------------------------------
26303 Fix whitespace in "Format of STDIN stream" of fast-import
26304 Avoid using va_copy in fast-import: it seems to be unportable.
26306 Arjen Laarhoven (2):
26307 gitk: Make the date/time display configurable
26308 t1301-shared-repo.sh: fix 'stat' portability issue
26311 Clarify actual behavior of 'git add' and ignored files
26313 Brian Gernhardt (1):
26314 Minor clarifications to git-filter-branch usage and doc
26317 Fix misspelling of 'suppress' in docs
26320 git-svn: fix log with single revision against a non-HEAD branch
26323 gitk: Handle 'copy from' and 'copy to' in diff headers.
26325 Junio C Hamano (10):
26326 Fix "git add -u" data corruption.
26328 Fix read-tree merging more than 3 trees using 3-way merge
26329 Update documentation links for older releases.
26330 git-clone: allow --bare clone
26331 Documentation/git-rebase: fix an example
26332 Clean-up read-tree error condition.
26333 fast-import pull request
26334 git clone: do not issue warning while cloning locally across filesystems
26338 git-submodule: re-enable 'status' as the default subcommand
26340 Linus Torvalds (2):
26341 Make thin-pack generation subproject aware.
26342 Take binary diffs into account for "git rebase"
26344 Lukas Sandström (1):
26345 Add the word reflog to Documentation/config.txt:core.logAllRefUpdates
26348 git-completion.bash - add support for git-bundle
26351 Add and document a global --no-pager option for git.
26354 Clarify commit-tree documentation
26357 pack-objects: remove bogus arguments to delta_cacheable()
26359 Paul Mackerras (3):
26360 gitk: Fix warning when removing a branch
26361 gitk: Fix bug in fix for warning when removing a branch
26362 gitk: Add a window to list branches, tags and other references
26365 path-list.c: always free strdup'ed paths
26367 Salikh Zakirov (1):
26368 git-add -u paths... now works from subdirectory
26370 Sean Estabrooks (1):
26371 Fix small typo in git send-email man page.
26373 Shawn O. Pearce (11):
26374 git-gui: Avoid Tcl error in popup menu on diff viewer
26375 Actually allow TAG_FIXUP branches in fast-import
26376 Use handy ALLOC_GROW macro in fast-import when possible
26377 Teach fast-import to ignore lines starting with '#'
26378 Make trailing LF following fast-import `data` commands optional
26379 Make trailing LF optional for all fast-import commands
26380 Allow frontends to bidirectionally communicate with fast-import
26381 Generate crash reports on die in fast-import
26382 Include recent command history in fast-import crash reports
26383 Correct documentation of 'reflog show' to explain it shows HEAD
26384 Don't allow combination of -g and --reverse as it doesn't work
26386 Steffen Prohaska (1):
26387 gitk: Let user easily specify lines of context in diff view
26390 Document what the stage numbers in the :$n:path syntax mean.
26392 Sven Verdoolaege (1):
26393 git-apply: apply submodule changes
26396 git-gui: Added support for OS X right click
26399 Version v1.5.3-rc5; changes since v1.5.3-rc4:
26400 ---------------------------------------------
26403 Documentation/git-svn: how to clone a git-svn-created repository
26405 Alberto Bertogli (1):
26406 Allow git-svnimport to take "" as the trunk directory.
26409 Fix filehandle leak in "git branch -D"
26410 gitk: Continue and show error message in new repos
26411 gitk: Show an error and exit if no .git could be found
26413 Alexandre Julliard (3):
26414 git.el: Add support for interactive diffs.
26415 git.el: Always set the current directory in the git-diff buffer.
26416 git-add: Add support for --refresh option.
26419 cvsserver: Fix for work trees
26420 Add read_cache to builtin-check-attr
26422 Brian Gernhardt (1):
26423 Fix t5701-clone-local for white space from wc
26426 Make git tag a builtin.
26427 builtin-tag.c: Fix two memory leaks and minor notation changes.
26428 Make verify-tag a builtin.
26431 Documentation/git-commit.txt: correct bad list formatting.
26432 Add support for an info version of the user manual
26433 INSTALL: explain info installation and dependencies.
26434 Documentation/Makefile: remove cmd-list.made before redirecting to it.
26435 git-sh-setup.sh: make GIT_DIR absolute
26436 Add a test for git-commit being confused by relative GIT_DIR
26439 git-am: initialize variable $resume on startup
26441 J. Bruce Fields (4):
26442 user-manual: update for new default --track behavior
26443 user-manual: mention git-gui
26444 documentation: use the word "index" in the git-add manual page
26445 documentation: use the word "index" in the git-commit man page
26447 Jakub Narębski (1):
26448 gitweb: Fix handling of $file_name in feed generation
26450 Johannes Schindelin (4):
26451 launch_editor(): Heed GIT_EDITOR and core.editor settings
26452 Teach "git stripspace" the --strip-comments option
26453 checkout-index needs a working tree
26454 Reinstate the old behaviour when GIT_DIR is set and GIT_WORK_TREE is unset
26456 Junio C Hamano (24):
26457 git-clone: aggressively optimize local clone behaviour.
26458 git-completion: add "git stash"
26459 INSTALL: add warning on docbook-xsl 1.72 and 1.73
26460 unpack-trees.c: assume submodules are clean during check-out
26461 Fix install-doc-quick target
26462 user-manual: mention git stash
26463 setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
26464 pager: find out pager setting from configuration
26465 Fix "make GZ=1 quick-install-doc"
26466 Reorder the list of commands in the manual.
26467 Fix formatting of git-blame documentation.
26468 Fix an illustration in git-rev-parse.txt
26469 tweak manpage formatting
26470 Revert "tweak manpage formatting"
26471 Optimize "diff --cached" performance.
26472 allow git-bundle to create bottomless bundle
26473 allow git-bundle to create bottomless bundle
26474 t3404: fix "fake-editor"
26475 builtin-bundle create - use lock_file
26476 git-diff: squelch "empty" diffs
26477 merge-recursive: do not rudely die on binary merge
26478 attr.c: refactoring
26479 attr.c: read .gitattributes from index as well.
26482 Jyotirmoy Bhattacharya (1):
26483 Fixed git-push manpage
26485 Linus Torvalds (8):
26486 connect: accept file:// URL scheme
26487 apply: remove directory that becomes empty by renaming the last file away
26488 Start moving unpack-trees to "struct tree_desc"
26489 Fix "git commit directory/" performance anomaly
26490 Move old index entry removal from "unpack_trees()" into the individual functions
26491 Optimize the common cases of git-read-tree
26492 Optimize the two-way merge of git-read-tree too
26493 Optimize the three-way merge of git-read-tree
26495 Luiz Fernando N. Capitulino (3):
26496 Avoid ambiguous error message if pack.idx header is wrong
26497 Introduces xmkstemp()
26498 Use xmkstemp() instead of mkstemp()
26500 Marco Costalba (1):
26501 Add --log-size to git log to print message size
26504 builtin-bundle.c - use stream buffered input for rev-list
26505 builtin-bundle - use buffered reads for bundle header
26506 gitk: Enable selected patch text on Windows
26507 gitk: Handle MouseWheel events on Windows
26508 t3902 - skip test if file system doesn't support HT in names
26510 Paul Mackerras (4):
26511 gitk: Add a context menu for file list entries
26512 gitk: Fix bug causing the "can't unset idinlist(...)" error
26513 gitk: Fix bug introduced in commit 67a4f1a7
26514 gitk: Fix bug causing Tcl error when updating graph
26516 Randal L. Schwartz (1):
26517 add "test-absolute-path" to .gitignore
26520 git-p4: Fix the sorting of changelists when cloning a Perforce repository.
26523 diff: don't run pager if user asked for a diff style exit code
26524 diff: squelch empty diffs even more
26526 Shawn O. Pearce (4):
26527 Document GIT_SSH environment variable alongside other variables
26528 Teach update-paranoid how to store ACLs organized by groups
26529 Teach the update-paranoid to look at file differences
26530 Use the empty tree for base diff in paranoid-update on new branches
26532 Simon Hausmann (2):
26533 git-p4: Fix support for symlinks.
26534 git-p4: Fix git-p4 submit to include only changed files in the perforce submit template.
26536 Steffen Prohaska (1):
26537 Improved hint on how to set identity
26540 git-stash documentation: stash numbering starts at zero, not one
26541 git-stash documentation: add missing backtick
26544 Add a note about the index being updated by git-status in some cases
26546 Uwe Kleine-König (3):
26547 send-email: teach sanitize_address to do rfc2047 quoting
26548 send-email: rfc822 forbids using <address@domain> without a non-empty "phrase"
26549 send-email: get all the quoting of realnames right
26552 Version v1.5.3-rc4; changes since v1.5.3-rc3:
26553 ---------------------------------------------
26556 Add an option to specify a file to config builtin
26557 Add a test for git-config --file
26558 Make verse of git-config manpage more readable
26559 Hack git-add--interactive to make it work with ActiveState Perl
26561 Alexandre Julliard (2):
26562 git.el: Avoid using ewoc-set-data for compatibility with Emacs 21.
26563 git.el: Take into account the core.excludesfile config option.
26565 Bradford C. Smith (2):
26566 fully resolve symlinks when creating lockfiles
26567 use lockfile.c routines in git_commit_set_multivar()
26569 Brian Gernhardt (1):
26570 Document commit.template configuration variable.
26572 Christian Couder (1):
26573 rev-list --bisect: fix allocation of "int*" instead of "int".
26575 Christian Stimming (1):
26576 git-gui: Unify wording to say "to stage" instead of "to add"
26579 Makefile: use $(FIND) instead of find
26580 git-sh-setup.sh: make GIT_EDITOR/core.editor/VISUAL/EDITOR accept commands
26581 When generating manpages, delete outdated targets first.
26583 David Soria Parra (1):
26584 Documentation/gitattributes.txt: typofix
26587 Fix documentation for core.gitproxy to reflect code
26589 Han-Wen Nienhuys (2):
26590 Sort output of "p4 change" in incremental import before further
26591 Fix style nit in Python slicing.
26593 Jakub Narębski (3):
26594 gitweb: Show submodule entries in the 'tree' view
26595 gitweb: Simplify 'opt' parameter validation, add "no merges" feeds
26596 gitweb: Allow for multivalued parameters passed to href subroutine
26599 Documentation/git-diff: remove -r from --name-status example
26600 git-diff: turn on recursion by default
26603 --base-path-relaxed option
26605 Johannes Schindelin (11):
26606 rebase -i: fix overzealous output redirection
26607 rebase -i: fix interrupted squashing
26608 white space fixes in setup.c
26609 Add is_absolute_path() and make_absolute_path()
26610 Add functions get_relative_cwd() and is_inside_dir()
26611 Add set_git_dir() function
26612 Clean up work-tree handling
26613 get_relative_cwd(): clarify why it handles dir == NULL
26614 rebase -i: ignore patches that are already in the upstream
26615 rebase -i: fix for optional [branch] parameter
26616 read-tree: remove unnecessary call to setup_git_directory()
26618 Julian Phillips (1):
26619 git-gui: Handle git versions of the form n.n.n.GIT
26621 Junio C Hamano (23):
26622 Make sure git-stash works from subdirectory.
26623 gitweb: fix broken snapshot
26624 git-submodule module_name: avoid using unwieldy "value_regexp" feature.
26625 git-submodule: remove redundant call to git-describe
26626 When locking in a symlinked repository, try to lock the original.
26627 git_mkstemp(): be careful not to overflow the path buffer.
26628 Update description of -z option.
26629 git-stash: do not remove a ref by hand.
26630 Add test for symlinked configuration file updates.
26631 Fix git-stash apply --index
26632 git-stash apply --index: optimize postprocessing
26633 log_ref_write() -- do not chomp reflog message at the first LF
26634 symbolic-ref, update-ref: do not refuse reflog message with LF
26635 rebase: try not to munge commit log message
26636 add_file_to_index: skip rehashing if the cached stat already matches
26637 Unset GIT_EDITOR while running tests.
26638 git.c: execution path
26639 git-commit.sh: Permit the --amend message to be given with -m/-c/-C/-F.
26640 RelNotes 1.5.3 updates before -rc4
26641 Fix work-tree related breakages
26642 gitweb: do not choke on recursive symlink
26643 Fix bogus use of printf in t3700 test
26646 Kristian Høgsberg (1):
26647 Add test case for basic commit functionality.
26650 gitk: Ignore ctrl-z as EOF on windows
26652 Nanako Shiraishi (1):
26653 git-stash: Make sure reflog is created for refs/stash
26655 Nguyễn Thái Ngọc Duy (1):
26656 git-write-tree should not crash if prefix does not exist
26658 Paul Mackerras (4):
26659 gitk: Show changes in index and changes in working directory separately
26660 gitk: Make the fake commit for the index changes green rather than magenta
26661 gitk: Wait for the window to become visible after creating it
26662 gitk: Fix bugs in the Find function
26665 git-svn: Translate invalid characters in refname
26667 Robert Schiele (2):
26668 add option to find zlib in custom path
26669 make the name of the library directory a config option
26671 Robin Rosenberg (1):
26672 Document --unified/-U option
26675 Rename git-rebase interactive buffer: todo => git-rebase-todo
26677 Shawn O. Pearce (49):
26678 git-gui: Skip -dirty suffix on core git versions
26679 git-gui: Brown paper bag "dirty git version fix"
26680 git-gui: Always disable the Tcl EOF character when reading
26681 git-gui: Delay searching for 'nice' until its really asked for
26682 git-gui: Don't crash in ask_popup if we haven't mapped main window yet
26683 git-gui: Change our initial GC hint to be an estimate
26684 git-gui: Let the user continue even if we cannot understand git version
26685 git-gui: Delay the GC hint until after we are running
26686 git-gui: Move feature option selection before GIT_DIR init
26687 git-gui: Allow blame/browser subcommands on bare repositories
26688 git-gui: Allow browser subcommand to start in subdirectory
26689 git-gui: Allow users to browse any branch, not just the current one
26690 git-gui: Clarify the visualize history menu options
26691 git-gui: Increase the default height of the revision picker
26692 git-gui: Convert merge dialog to use class system
26693 Don't offer my special Tools/Migrate hack unless in multicommit
26694 git-gui: Bind Ctrl/Cmd-M to merge action
26695 git-gui: Avoid unnecessary global statements when possible
26696 git-gui: Translate standard encoding names to Tcl ones
26697 git-gui: Don't show blame tooltips that we have no data for
26698 git-gui: Completely remove support for creating octopus merges
26699 git-gui: Automatically backup the user's commit buffer
26700 git-gui: Save the merge base during checkout_op processing
26701 git-gui: Factor out common fast-forward merge case
26702 git-gui: Simplify error case for unsupported merge types
26703 git-gui: Skip unnecessary read-tree work during checkout
26704 git-gui: Internally allow fetch without storing for future pull support
26705 git-gui: Completely remove my Tools/Migrate hack
26706 git-gui: Fix unnecessary fast-forward during checkout
26707 gitk: Bind keyboard actions to the command key on Mac OS
26708 git-gui: Clarify meaning of add tracked menu option
26709 git-gui: Paper bag fix quitting crash after commit
26710 git-gui: Refactor diff popup into a procedure to ease i18n work
26711 git-gui: Refactor current branch menu items to make i18n easier
26712 git-gui: Avoid unnecessary symbolic-ref call during checkout
26713 git-gui: Save remote urls obtained from config/remotes setup
26714 git-gui: Display commit/tag/remote info in tooltip of revision picker
26715 git-gui: Show ref last update times in revision chooser tooltips
26716 git-gui: Replace merge dialog with our revision picker widget
26717 git-gui: Cleanup bindings within merge dialog
26718 git-gui: Format tracking branch merges as though they were pulls
26719 git-gui: Remove usernames from absolute SSH urls during merging
26720 git-gui: Don't kill modified commit message buffer with merge templates
26721 git-gui: Honor core.excludesfile when listing extra files
26722 git-gui: Use progress bar while resetting/aborting files
26723 git-gui: Make sure remotes are loaded when picking revisions
26724 git-gui: Don't offer to stage hunks from untracked files
26725 git-gui: Use more modern looking icons in the tree browser
26726 git-gui: Minor refactoring of merge command line in merge support
26728 Simon Hausmann (1):
26729 git-p4: Fix p4 user cache population on Windows.
26732 Try to be consistent with capitalization in the documentation
26734 Thomas Schwinge (2):
26735 Don't rely on unspecified behavior
26736 Support building on GNU/Hurd
26739 Version v1.5.3-rc3; changes since v1.5.3-rc2:
26740 ---------------------------------------------
26743 Add GIT_EDITOR environment and core.editor configuration variables
26745 Alexandre Julliard (2):
26746 git.el: Support for incremental status updates.
26747 git.el: Pass an explicit argument to enable smerge-mode.
26750 Rename read_pipe() with read_fd() and make its buffer nul-terminated.
26753 contrib/emacs/Makefile: Also install .el files.
26754 Documentation/gitignore.txt: Fix the seriously misleading priority explanation
26757 git-svn: fix commiting renames over DAV with funky file names
26759 Francis Moreau (1):
26760 Fix git-branch documentation when using remote refs
26762 Jakub Narębski (3):
26763 gitweb cleanup: Move @diff_opts declaration earlier
26764 gitweb: Fix support for legacy gitweb config for snapshots
26765 gitweb: More detailed error messages for snapshot format
26768 pretty-options.txt: tiny doc fix
26770 Johannes Schindelin (11):
26771 filter-branch: get rid of "set -e"
26772 rebase -i: call editor just once for a multi-squash
26773 fsck --lost-found: write blob's contents, not their SHA-1
26774 mailinfo: fix 'fatal: cannot convert from utf-8 to utf-8'
26775 Shut "git rebase -i" up when no --verbose was given
26776 rebase -i: exchange all "if [ .. ]" by "if test .."
26777 filter-branch: Big syntax change; support rewriting multiple refs
26778 Teach revision machinery about --no-walk
26779 git log -g: Complain, but do not fail, when no reflogs are there
26780 Teach approxidate() to understand "never"
26781 git am: skip pine's internal folder data
26783 Julian Phillips (1):
26784 Force listingblocks to be monospaced in manpages
26786 Junio C Hamano (8):
26788 Do not expect unlink(2) to fail on a directory.
26789 Fix VISUAL/EDITOR preference order in Documentation/config.txt.
26790 Synonyms: -i == --regexp-ignore-case, -E == --extended-regexp
26791 Mark user-manual as UTF-8
26792 user-manual: fix typolets.
26793 t9200: Be careful when checking CVS/Entries
26797 send-email: Update regex parsing for pine aliases
26799 Linus Torvalds (2):
26800 Do a better job at guessing unknown character sets
26801 Fix up duplicate parents removal
26803 Marco Costalba (1):
26804 Avoid to duplicate commit message when is not encoded
26806 Matt McCutchen (1):
26807 gitweb: snapshot cleanups & support for offering multiple formats
26809 Nanako Shiraishi (1):
26810 Document "git stash message..."
26813 filter-branch: fix dash complaining about "Missing '))'"
26814 cleanup unpack-trees.c: shrink struct tree_entry_list
26817 git-svn: Minimalistic patch which allows svn usernames with space(s).
26819 Robin Rosenberg (1):
26820 cvsexportcommit: avoid racy CVS problem.
26823 git-p4: use subprocess in p4CmdList
26824 git-p4: input to "p4 files" by stdin instead of arguments
26826 Simon Hausmann (3):
26827 git-p4: Cleanup, make listExistingP4Branches a global function for later use.
26828 git-p4: Fix upstream branch detection for submit/rebase with multiple branches.
26829 git-p4: Cleanup, used common function for listing imported p4 branches
26832 Document how to tell git to not launch a pager
26833 Teach git-commit about commit message templates.
26835 Sven Verdoolaege (1):
26836 unpack-trees.c: assume submodules are clean during check-out
26839 Version v1.5.3-rc2; changes since v1.5.3-rc1:
26840 ---------------------------------------------
26843 Fix git-rebase -i to allow squashing of fast-forwardable commits
26846 Use $(RM) in Makefiles instead of 'rm -f'
26849 git-svn: remove leading slashes from fetch lines in the generate config
26852 make git-send-email.perl handle email addresses with no names when Email::Valid is present
26854 Jakub Narębski (3):
26855 Update git-merge documentation.
26856 Document long options '--message=<msg>' and '--no-commit'
26857 Document git commit --untracked-files and --verbose
26860 git-cvsserver: detect/diagnose write failure, etc.
26863 Remove useless uses of cat, and replace with filename arguments
26865 Junio C Hamano (7):
26866 Make show_rfc2822_date() just another date output format.
26867 Wire new date formats to --date=<format> parser.
26868 Document new --date=<format>
26869 Add contrib/stats/mailmap.pl script
26871 Documentation/git-commit-tree: remove description of a nonexistent limitation
26874 Marius Storm-Olsen (1):
26875 Fix git-p4 on Windows to not use the Posix sysconf function.
26878 More permissive "git-rm --cached" behavior without -f.
26881 Pack-objects: properly initialize the depth value
26883 Paul Mackerras (1):
26884 gitk: Fix bug introduced by previous commit
26886 Peter Hagervall (1):
26887 Make every builtin-*.c file #include "builtin.h"
26889 Robin Rosenberg (1):
26890 Support output ISO 8601 format dates
26892 Sean Estabrooks (3):
26893 Remove "WITH_P4IMPORT" knob from the Makefile
26894 Remove p4 rpm from git.spec.in.
26895 Demote git-p4import to contrib status.
26897 Shawn O. Pearce (2):
26898 Correct trivial typo in fast-import documentation
26899 Teach fast-import to recursively copy files/directories
26901 Stephen Rothwell (1):
26902 send-email: discard blank around address in extract_valid_address as well.
26904 Sven Verdoolaege (1):
26905 lockfile.c: schedule remove_lock_file only once.
26908 Version v1.5.3-rc1; changes since v1.5.3-rc0:
26909 ---------------------------------------------
26912 fix remote.origin.url in tutorial.txt
26915 Handle missing prefix for "Subject:" as if no prefix given
26916 Handle format.subjectprefix for every command which accepts --pretty
26917 Fix t5516 to create test repo without hooks
26918 Add -v|--verbose to git remote to show remote url
26921 Remove USE_PAGER from git-pickaxe and git-annotate
26922 Add urls.txt to git-clone man page
26925 user-manual: grammar and style fixes
26927 Brian Downing (10):
26928 pack-objects: Prefer shallower deltas if the size is equal
26929 gitk: Fix for tree view ending in nested directories
26930 Pack information tool
26931 Correct shebang line for contrib/stats/packinfo.pl
26932 Don't try to delta if target is much smaller than source
26933 Support fetching the memory usage of a delta index
26934 Add functions for parsing integers with size suffixes
26935 Add pack-objects window memory usage limit
26936 Add --window-memory option to git-repack
26937 Add documentation for --window-memory, pack.windowMemory
26939 Brian Gernhardt (1):
26940 Add core.pager config variable.
26942 CJ van den Berg (1):
26943 git-submodule: Fix two instances of the same typo
26946 t7004: Skip tests for signed tags in an old version of gpg.
26947 t0030: Remove repeated instructions and add missing &&
26948 t0030: Add tests with consecutive text lines and others with spaces added.
26949 t7004: Add tests for the git tag -n option.
26950 Function stripspace now gets a buffer instead file descriptors.
26952 Daniel Barkalow (2):
26953 Add allocation and freeing functions for struct refs
26954 Some cosmetic changes to remote library
26957 Add missing functions to contrib/emacs/vc-git.el
26960 git-svn: fix blocking with svn:// servers after do_switch
26962 Frank Lichtenheld (1):
26963 cvsserver: always initialize state in argsplit()
26966 git-gui: properly popup error if gitk should be started but is not installed
26967 git-commit: don't add multiple Signed-off-by: from the same identity
26969 J. Bruce Fields (2):
26971 user-manual: more explanation of push and pull usage
26974 stash: allow running from a subdirectory
26977 Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
26979 Johannes Schindelin (24):
26980 diff --no-index: fix --name-status with added files
26981 glossary: add 'reflog'
26982 Document git-filter-branch
26983 Add diff-option --ext-diff
26984 filter-branch: add a test for the commit removal example
26985 filter-branch: make output nicer
26986 filter-branch: a few more touch ups to the man page
26987 filter-branch documentation: clarify which filters are eval'ed
26988 filter-branch: fail gracefully when a filter fails
26989 Future-proof source for changes in xdemitconf_t
26990 Teach git-stash to "apply --index"
26991 Enable "git rerere" by the config variable rerere.enabled
26992 git-branch: default to --track
26993 Fix "apply --reverse" with regard to whitespace
26994 branch.autosetupmerge: allow boolean values, or "all"
26995 rebase -i: handle --continue more like non-interactive rebase
26996 rebase -i: actually show the diffstat when being verbose
26997 rebase -i: remember the settings of -v, -s and -p when interrupted
26998 rebase -i: put a nice warning into the todo list
26999 rerere: record resolution even if file is not in merge base
27000 Fix core.sharedRepository = 2
27001 Fix --cherry-pick with given paths
27002 Add for_each_remote() function, and extend remote_find_tracking()
27003 branch --track: code cleanup and saner handling of local branches
27006 filter-branch: Avoid an error message in the map function.
27007 filter-branch documentation: some more touch-ups.
27008 Allow rebase to run if upstream is completely merged
27011 fsck --lost-found writes to subdirectories in .git/lost-found/
27013 Junio C Hamano (22):
27014 Update draft Release Notes for 1.5.3
27015 Update reflog message created for stashes
27016 Do not check if getcwd() result begins with a slash.
27017 Fix git-stash(1) markup.
27018 git-stash: allow more descriptive reminder message when saving
27019 Introduce diff_filespec_is_binary()
27020 Per-path attribute based hunk header selection.
27021 Fix configuration syntax to specify customized hunk header patterns.
27022 diff: honor binariness specified in attributes
27023 gitweb: make repeated calls to git_get_project_owner() bearable
27024 diff.c: make built-in hunk header pattern a separate table
27025 git-gui: use "blame -w -C -C" for "where did it come from, originally?"
27026 git-stash: try reusing cached stat info as much as possible
27027 Fix merge-one-file for our-side-added/our-side-removed cases
27028 Document custom hunk header selection
27029 revision.c: remove duplicated parents after history simplification
27030 Revert 88494423 (removal of duplicate parents in the output codepath)
27031 Re-code builtin-branch.c in UTF-8
27032 Teach read-tree 2-way merge to ignore intermediate symlinks
27034 Update list of older git docs
27038 git-submodule(1): update description and key names
27040 Marcus Fritzsch (1):
27041 Fixed a formulation mistake in Documentation/user-manual.txt
27044 Prefer EMAIL to username@hostname.
27045 Change "added.moved or removed" to "added, moved or removed" in
27046 Add [verse] to the SYNOPSIS section of git-submodule.txt.
27048 Matt McCutchen (3):
27049 gitweb: make search form generate pathinfo-style URLs
27050 gitweb: make "No commits" in project list gray, not bold green
27051 Makefile: rebuild git.o on version change, clean up git$X flags
27053 Matthias Lederhofer (3):
27054 git-init: set core.worktree if GIT_WORK_TREE is specified
27055 git-clone: split up long &&-command-chain and use a function for cleanup
27056 make git-clone GIT_WORK_TREE aware
27058 Michael Hendricks (2):
27059 git-send-email: allow an email alias for --from
27060 gitweb: configurable width for the projects list Description column
27063 Document -<n> for git-format-patch
27064 gitweb: prefer git_get_project_owner() over get_file_owner()
27065 gitweb: new cgi parameter: opt
27068 apply delta depth bias to already deltified objects
27069 script to display a distribution of longest common hash prefixes
27070 reduce git-pack-objects memory usage a little more
27072 Paul Mackerras (6):
27073 gitk: Fix the find and highlight functions
27074 gitk: Fix bug in the anc_or_desc routine
27075 gitk: Remove the unused stopfindproc function
27076 gitk: Fix bug causing "can't read commitrow(0,n)" error
27077 gitk: Use git log and add support for --left-right
27078 gitk: Improve handling of -- and ambiguous arguments
27081 diff-lib.c: don't strdup twice
27083 Sean Estabrooks (1):
27084 Alter git-checkout reflog message to include "from" branch
27086 Shawn O. Pearce (46):
27087 git-gui: Unlock the index when cancelling merge dialog
27088 git-gui: Start blame windows as tall as possible
27089 git-gui: Correct resizing of remote branch delete dialog
27090 git-gui: Don't bind F5/M1-R in all windows
27091 git-gui: Bind M1-P to push action
27092 git-gui: Include a Push action on the left toolbar
27093 git-gui: Ensure windows shortcuts always have .bat extension
27094 git-gui: Honor rerere.enabled configuration option
27095 git-gui: New Git version check support routine
27096 git-gui: Skip nicknames when selecting author initials
27097 git-gui: Teach class system to support [$this cmd] syntax
27098 git-gui: Abstract the revision picker into a mega widget
27099 git-gui: Refactor the delete branch dialog to use class system
27100 git-gui: Optimize for newstyle refs/remotes layout
27101 git-gui: Maintain remote and source ref for tracking branches
27102 git-gui: Allow users to match remote branch names locally
27103 git-gui: Fast-forward existing branch in branch create dialog
27104 git-gui: Enhance choose_rev to handle hundreds of branches
27105 git-gui: Sort tags descending by tagger date
27106 git-gui: Option to default new branches to match tracking branches
27107 git-gui: Automatically refresh tracking branches when needed
27108 git-gui: Better handling of detached HEAD
27109 git-gui: Refactor our ui_status_value update technique
27110 git-gui: Refactor branch switch to support detached head
27111 git-gui: Unabbreviate commit SHA-1s prior to display
27112 git-gui: Default selection to first matching ref
27113 git-gui: Allow double-click in checkout dialog to start checkout
27114 git-gui: Extract blame viewer status bar into mega-widget
27115 git-gui: Change the main window progress bar to use status_bar
27116 git-gui: Show a progress meter for checking out files
27117 git-gui: Always use absolute path to all git executables
27118 git-gui: Correct gitk installation location
27119 git-gui: Assume unfound commands are known by git wrapper
27120 git-gui: Treat `git version` as `git --version`
27121 git-gui: Perform our own magic shbang detection on Windows
27122 git-gui: Teach console widget to use git_read
27123 git-gui: Improve the Windows and Mac OS X shortcut creators
27124 git-gui: Correct ls-tree buffering problem in browser
27125 git-gui: Don't linewrap within console windows
27126 git-gui: Paper bag fix for Cygwin shortcut creation
27127 git-gui: Use sh.exe in Cygwin shortcuts
27128 git-gui: Include a space in Cygwin shortcut command lines
27129 Clarify documentation of fast-import's D subcommand
27130 Support wholesale directory renames in fast-import
27131 git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
27132 git-gui: Change prior tree SHA-1 verification to use git_read
27134 Steffen Prohaska (1):
27135 filter-branch: added missing warn function
27138 Documentation for git-log --follow
27140 Uwe Kleine-König (2):
27141 stash: end commit log with a newline
27142 repack: don't report "Nothing new to pack." if -q is given
27144 William Pursell (1):
27145 user-manual: fix directory name in git-archive example
27148 Version v1.5.3-rc0; changes since v1.5.2.5:
27149 -------------------------------------------
27152 git-send-email: Add --threaded option
27153 git-send-email: make options easier to configure.
27154 format-patch: Add format.subjectprefix config option
27157 Fix the progress code to output LF only when it is really needed
27158 Add run_command_v_opt_cd: chdir into a directory before exec
27159 Add ability to specify environment extension to run_command
27160 Allow environment variables to be unset in the processes started by run_command
27161 Verbose connect messages to show the IP addresses used
27162 Add another verbosity level to git-fetch
27163 Add a configuration option to control diffstat after merge
27164 Fix push with refspecs containing wildcards
27165 Do not use h_errno after connect(2): the function does not set it
27166 cvsserver: Actually implement --export-all
27167 Avoid perl in t1300-repo-config
27169 Alexandre Julliard (1):
27170 pack-check: Sort entries by pack offset before unpacking them.
27172 Alexandre Vassalotti (1):
27173 git-tag: Fix "can't shift that many".
27175 Andy Whitcroft (3):
27176 cvsimport: add support for new style remote layout
27177 cvsimport: update documentation to include separate remotes option
27178 cvsimport: add <remote>/HEAD reference in separate remotes more
27180 Aneesh Kumar K.V (2):
27181 gitview: Fix the blame interface.
27182 gitview: run blame with -C -C
27184 Benjamin Sergeant (1):
27185 git-p4 fails when cloning a p4 depo.
27187 Brian Gernhardt (1):
27188 Fix t5516-fetch for systems where `wc -l` outputs whitespace.
27191 Fix git-stripspace to process correctly long lines and spaces.
27192 Add test script for git-stripspace.
27193 Add test-script for git-tag
27196 git-mergetool: Allow gvimdiff to be used as a mergetool
27199 Custom compression levels for objects and packs
27200 Alter sha1close() 3rd argument to request flush only
27201 git-repack --max-pack-size: new file statics and code restructuring
27202 git-repack --max-pack-size: write_{object,one}() respect pack limit
27203 git-repack --max-pack-size: split packs as asked by write_{object,one}()
27204 git-repack --max-pack-size: add option parsing to enable feature
27205 pack-objects: clarification & option checks for --max-pack-size
27206 Ensure git-repack -a -d --max-pack-size=N deletes correct packs
27208 Daniel Barkalow (6):
27209 Move remote parsing into a library file out of builtin-push.
27210 Move refspec parser from connect.c and cache.h to remote.{c,h}
27211 Add handlers for fetch-side configuration of remotes.
27212 Update local tracking refs when pushing
27213 Move refspec pattern matching to match_refs().
27214 Fix pushing to a pattern with no dst
27217 Generate tags with correct timestamp (git-svnimport)
27219 Elvis Pranskevichus (1):
27220 Use git-tag in git-cvsimport
27223 git-submodule: Instead of using only annotated tags, use any tags.
27226 git-svn: cleanup: factor out longest_common_path() function
27227 git-svn: test for creating new directories over svn://
27228 git-svn: reduce stat() calls for a backwards compatibility check
27229 git-svn: allow dcommit to retain local merge information
27231 Fernando J. Pereda (1):
27232 Teach mailsplit about Maildir's
27234 Frank Lichtenheld (11):
27235 t9400: Add test cases for config file handling
27236 t9400: Add some more cvs update tests
27237 t9400: Add some basic pserver tests
27238 t9400: Work around CVS' deficiencies
27239 cvsserver: Handle 'cvs login'
27240 cvsserver: Make req_Root more critical of its input data
27241 cvsserver: Add some useful commandline options
27242 cvsserver: Let --base-path and pserver get along just fine
27243 cvsserver: Actually implement --export-all
27244 config: Add --null/-z option for null-delimted output
27245 config: add support for --bool and --int while setting values
27248 Unify write_index_file functions
27251 git-branch: cleanup config file when deleting branches
27252 git-svn: trailing slash in prefix is mandatory with --branches/-b
27253 git-cvsimport: force checkout of working tree after initial import
27255 Han-Wen Nienhuys (28):
27257 reformatting: break long lines.
27258 rename apply() to applyCommit(); apply is a python builtin
27259 add .dotest to .gitignore
27260 Robustness fixes for pipes
27263 clone and sync --keep-path to keep perforce path to module.
27264 use string.strip() iso. slicing.
27265 use strip() iso. slicing for removing \n
27266 add --verbose to all commands.
27267 Extract multiple paths concurrently.
27269 remove global .gitdir
27270 Read p4 files in one batch.
27271 Thinko, fix buglet.
27272 store p4 user cache in home directory.
27274 read files before creating the commit.
27275 don't p4 print deleted files.
27276 only run p4 print if necessary
27277 use p4CmdList() to get file contents in Python dicts. This is more robust.
27278 Cleanups & import into p4/master for local import
27280 thinko: really ignore deleted files.
27281 look for 'text' and 'binary' files.
27282 print error message when p4 print fails (eg. due to permission problems)
27283 also strip p4/ from local imports.
27285 Jakub Narębski (16):
27286 gitweb: Add test t9500 for gitweb (as standalone script)
27287 Add an option to git-ls-tree to display also the size of blob
27288 gitweb: Provide links to commitdiff to each parent in 'commitdiff' view
27289 gitweb: Improve "next" link in commitdiff view
27290 gitweb: Split git_patchset_body into separate subroutines
27291 gitweb: Create special from-file/to-file header for combined diff
27292 gitweb: Add links to blobdiffs in from-file/to-file header for merges
27293 gitweb: '--cc' for merges in 'commitdiff' view
27294 Document git rev-list --full-history
27295 Document git read-tree --trivial
27296 Document git rev-parse --is-inside-git-dir
27297 Document git reflog --stale-fix
27298 Document git rev-list --timestamp
27299 Use tabs for indenting definition list for options in git-log.txt
27300 Document git log --abbrev-commit, as a kind of pretty option
27301 Document git log --full-diff
27304 Add colour support in rebase and merge tree diff stats output.
27305 rev-parse: Identify short sha1 sums correctly.
27308 cmd_log_init: remove parsing of --encoding command line parameter
27309 refactor dir_add_name
27310 dir_struct: add collect_ignored option
27311 builtin-add: simplify (and increase accuracy of) exclude handling
27312 Fix ALLOC_GROW off-by-one
27313 Fix ALLOC_GROW calls with obsolete semantics
27314 git-stash: fix "no arguments" case in documentation
27315 git-stash: fix "can't shift that many" with no arguments
27316 git-stash: don't complain when listing in a repo with no stash
27317 Documentation: quote {non-attributes} for asciidoc
27318 Documentation: quote {non-attributes} for asciidoc
27319 Documentation: minor cleanups to branch/checkout wording
27321 Jeffrey C. Ollie (2):
27322 Add an option to quiet git-init.
27323 Quiet the output from git-init when cloning, if requested.
27326 Don't dereference a strdup-returned NULL
27327 detect close failure on just-written file handles
27328 Don't ignore a pack-refs write failure
27329 git-log: detect dup and fdopen failure
27332 Remove unnecessary code and comments on non-existing 8kB tag object restriction
27334 Johannes Schindelin (23):
27335 Update to SubmittingPatches
27336 Add git-filter-branch
27337 git-fsck: learn about --verbose
27338 Move buffer_is_binary() to xdiff-interface.h
27339 merge-recursive: refuse to merge binary files
27340 git-merge-file: refuse to merge binary files
27341 filter-branch: use $(($i+1)) instead of $((i+1))
27342 filter-branch: fix behaviour of '-k'
27343 t5000: skip ZIP tests if unzip was not found
27344 Teach filter-branch about subdirectory filtering
27345 Teach diff to imply --find-copies-harder upon -C -C
27346 pp_header(): work around possible memory corruption
27347 diffcore-rename: favour identical basenames
27348 filter-branch: add example to move everything into a subdirectory
27349 Move the pick_author code to git-sh-setup
27350 Teach rebase an interactive mode
27351 rebase -i: several cleanups
27352 rebase -i: provide reasonable reflog for the rebased branch
27353 Teach rebase -i about --preserve-merges
27354 t7004: ship trustdb to avoid gpg warnings
27355 git add: respect core.filemode with unmerged entries
27356 Make '!' aliases more useful
27357 git-fsck: add --lost-found option
27360 filter-branch: Use rev-list arguments to specify revision ranges.
27361 filter-branch: also don't fail in map() if a commit cannot be mapped
27362 Makefile: Remove git-merge-base from PROGRAMS.
27363 filter-branch: Simplify parent computation.
27364 filter-branch: subdirectory filter needs --full-history
27365 Avoid double-slash in path names that depend on $(sharedir).
27366 Remove trailing slash from $(template_dir).
27367 git-remote show: Also shorten non-fast-forward refs in the 'push' listing
27368 Test 'git add' for unmerged entries when core.symlinks=false.
27371 Add the --numbered-files option to git-format-patch.
27374 Fix git-am(1) synopsis formatting
27375 git-rebase: suggest to use git-add instead of git-update-index
27378 Fix typo in git-mergetool
27380 Julian Phillips (2):
27381 Makefile: Use generic rule to build test programs
27382 new-workdir: handle rev-parse --git-dir not always giving full path
27384 Junio C Hamano (48):
27385 git-apply: Fix removal of new trailing blank lines.
27386 pack-objects: pass fullname down to add_object_entry()
27387 Teach "delta" attribute to pack-objects.
27388 builtin-pack-objects: remove unnecessary code for no-delta
27389 Fix command line parameter parser of revert/cherry-pick
27390 Remove git-applypatch
27391 mailsplit: fix for more than one input files
27392 Add DLH to .mailmap
27393 Release Notes: start preparing for 1.5.3
27394 git-apply: what is detected and fixed is not just trailing spaces.
27395 t7003: make test repeatable
27396 git-branch --track: fix tracking branch computation.
27398 Test wildcard push/fetch
27399 More missing static
27400 More missing static
27401 Even more missing static
27402 remote.c: refactor match_explicit_refs()
27403 remote.c: refactor creation of new dst ref
27404 remote.c: minor clean-up of match_explicit()
27405 remote.c: fix "git push" weak match disambiguation
27406 remote.c: "git-push frotz" should update what matches at the source.
27407 git-push: Update description of refspecs and add examples
27408 git-blame: do not indent with spaces.
27409 git-blame -w: ignore whitespace
27410 mktag: minimally update the description.
27411 Lift 16kB limit of log message output
27412 Extend --pretty=oneline to cover the first paragraph,
27413 Makefile: common-cmds.h depends on generate-cmdlist.sh script
27414 Makefile: allow generating git.o for debugging purposes
27415 -Wold-style-definition fix
27417 Documentation: update "stale" links for 1.5.2.2
27418 INSTALL: explain how to build documentation
27419 Two trivial -Wcast-qual fixes
27420 git-send-email: Do not make @-less message ID
27421 Add core.quotepath configuration variable.
27422 Update draft Release Notes for 1.5.3
27423 diffcore_count_changes: pass diffcore_filespec
27424 diffcore_filespec: add is_binary
27425 diffcore-delta.c: update the comment on the algorithm.
27426 diffcore-delta.c: Ignore CR in CRLF for text files
27427 git-stash: require "save" to be explicit and update documentation
27428 Update public documentation links for 1.5.2.3
27429 "git-push $URL" without refspecs pushes only matching branches
27430 Rewrite "git-frotz" to "git frotz"
27431 git-stash: make "save" the default action again.
27432 Mark disused commit walkers officially deprecated.
27435 git-p4: check for existence of repo dir before trying to create
27438 Add git-submodule command
27439 Add basic test-script for git-submodule
27440 git-submodule: move cloning into a separate function
27441 git-submodule: clone during update, not during init
27442 t7400: barf if git-submodule removes or replaces a file
27443 git-submodule: remember to checkout after clone
27444 Rename sections from "module" to "submodule" in .gitmodules
27445 git-submodule: give submodules proper names
27447 gitmodules(5): remove leading period from synopsis
27449 Linus Torvalds (9):
27450 Make "git gc" pack all refs by default
27451 Make the pack-refs interfaces usable from outside
27452 Makefile: add an explicit rule for building assembly output
27453 Finally implement "git log --follow"
27454 Fix up "git log --follow" a bit..
27455 Clean up internal command handling
27456 Check for IO errors after running a command
27457 git: Try a bit harder not to lose errno in stdio
27458 Start deprecating "git-command" in favor of "git command"
27460 Marco Costalba (1):
27461 Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file
27463 Marius Storm-Olsen (7):
27464 Make the command call silent
27465 Replace \r\n with \n when importing from p4 on Windows
27466 Ensure that the commit message is Windows formated (CRLF) before invoking the editor.
27467 Fix git-p4 clone (defaultDestination)
27468 Fix single branch import into remotes
27469 Exclude the HEAD symbolic ref from the list of known branches
27470 Only use double quotes on Windows
27473 gitk: Make selection highlight color configurable
27474 gitk: Update fontsize in patch / tree list
27475 gitk: Allow specifying tabstop as other than default 8 characters.
27476 gitweb.perl - Optionally send archives as .zip files
27477 gitk: Use a spinbox for setting tabstop settings
27478 gitk: Update selection background colorbar in prefs dialog
27480 Martin Koegler (5):
27481 builtin-pack-objects: don't fail, if delta is not possible
27482 git-pack-objects: cache small deltas between big objects
27483 builtin-pack-object: cache small deltas
27484 diff-delta: use realloc instead of xrealloc
27485 gitweb: Handle non UTF-8 text better
27488 rename dirlink to gitlink.
27490 Matthias Lederhofer (18):
27491 add git-filter-branch to .gitignore
27492 make clean should remove all the test programs too
27493 filter-branch: prevent filters from reading from stdin
27494 chmod +x git-filter-branch.sh
27495 rev-parse: document --is-inside-git-dir
27496 rev-parse: introduce --is-bare-repository
27498 introduce GIT_WORK_TREE to specify the work tree
27499 Use new semantics of is_bare/inside_git_dir/inside_work_tree
27500 extend rev-parse test for --is-inside-work-tree
27502 setup_git_directory: fix segfault if repository is found in cwd
27503 filter-branch: always export GIT_DIR if it is set
27504 gitweb: change filename/directory name of snapshots
27505 make git barf when an alias changes environment variables
27506 make dist: include configure script in tarball
27507 ignore git-rebase--interactive
27508 getenv/setenv: use constants if available
27510 Matthijs Melchior (1):
27511 Teach git-tag about showing tag annotations.
27513 Michael Ellerman (2):
27514 gitview: Use new-style classes
27515 gitview: Define __slots__ for Commit
27517 Michael Krelin (1):
27518 git-svn: honor ~/.subversion/ client cert file settings.
27520 Michael S. Tsirkin (1):
27521 connect: display connection progress
27523 Nanako Shiraishi (3):
27524 Cloning from a repo without "current branch"
27525 Add git-stash script
27529 allow for undeltified objects not to be reused
27530 make "repack -f" imply "pack-objects --no-reuse-object"
27531 deprecate the new loose object header format
27532 fixes to output of git-verify-pack -v
27533 improve delta long block matching with big files
27534 update diff-delta.c copyright
27535 fix repack with --max-pack-size
27536 always start looking up objects in the last used pack first
27538 Paul Mackerras (18):
27539 gitk: Use the -q flag to git checkout
27540 gitk: New infrastructure for working out branches & previous/next tags
27541 gitk: Don't try to list large numbers of tags or heads in the details pane
27542 gitk: Add some more comments to the optimize_rows procedure
27543 gitk: Improve the behaviour of the initial selection
27544 gitk: Implement a simple scheduler for the compute-intensive stuff
27545 gitk: Cope with commit messages with carriage-returns and initial blank lines
27546 gitk: Disable the head context menu entries for the checked-out branch
27547 gitk: Store ids in rowrangelist and idrowranges rather than row numbers
27548 gitk: New algorithm for drawing the graph lines
27549 gitk: Show local uncommitted changes as a fake commit
27550 gitk: Speed up the reading of references
27551 gitk: Get rid of the childlist variable
27552 gitk: Add a "reset branch to here" row context-menu operation
27553 gitk: Limit how often we change the canvas scrolling region
27554 gitk: Fix bug causing nearby tags/heads to sometimes not be displayed
27555 gitk: Improve handling of whitespace and special chars in filenames
27556 gitk: Add a progress bar to show progress while resetting
27559 git-rev-list: Add regexp tuning options
27560 git-applymbox: Remove command
27562 Pierre Habouzit (3):
27563 $EMAIL is a last resort fallback, as it's system-wide.
27564 Active_nr is unsigned, hence can't be < 0
27568 git.spec: RPM failed, looking for wrong files.
27570 Randal L. Schwartz (1):
27571 Add test-sha1 to .gitignore.
27574 t5000: silence unzip availability check
27575 diffcore-rename: don't change similarity index based on basename equality
27576 diff: round down similarity index
27578 Robin Rosenberg (1):
27579 Add option to cvs update before export
27582 git-svn: avoid string eval for defining functions
27583 git-svn: use git-log rather than rev-list | xargs cat-file
27584 git-svn: cache max revision in rev_db databases
27586 Shawn O. Pearce (24):
27587 Teach git-describe how to run name-rev
27588 Lazily open pack index files on demand
27589 Micro-optimize prepare_alt_odb
27590 Attempt to delay prepare_alt_odb during get_sha1
27592 git-gui: GUI support for running 'git remote prune <name>'
27593 git-gui: Show the git-gui library path in 'About git-gui'
27594 git-gui: Enable verbose Tcl loading earlier
27595 git-gui: Provide fatal error if library is unavailable
27596 git-gui: Disable tearoff menus on Windows, Mac OS X
27597 git-gui: Allow users to rename branches through 'branch -m'
27598 git-gui: Allow users to delete remote branches
27599 git-gui: Expose the merge.diffstat configuration option
27600 Allow contrib new-workdir to link into bare repositories
27601 Test for recent rev-parse $abbrev_sha1 regression
27602 Simplify index access condition in count-objects, pack-redundant
27603 Ensure the pack index is opened before access
27604 Style nit - don't put space after function names
27605 git-gui: Internalize symbolic-ref HEAD reading logic
27606 git-gui: Quiet our installation process
27607 Avoid src:dst syntax as default bash completion for git push
27608 Document git-gui, git-citool as mainporcelain manual pages
27609 Teach bash how to complete +refspec on git-push
27610 Correct usages of sed in git-tag for Mac OS X
27612 Simon Hausmann (223):
27613 Initial import of a python script to import changesets from Perforce into git.
27614 Added basic support for specifying the depot path to import from as well as the range of perforce changes.
27615 Slightly improved help usage output and made specifying the trailing slash for the depot path optional.
27616 Implemented basic support for converting the date of the perforce change to the git format. The timezone isn't correctly set up yet though.
27617 Some fixes to the timezone conversion between the date of a perforce change and the git commit.
27618 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.
27619 Removed unused p4cat function and added helper function for the perforce python interface (p4Cmd).
27620 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.
27621 Minor code cleanups and ported some p4 interfacing code over to the p4 python mode.
27622 Instead of parsing the output of "p4 users" use the python objects of "p4 -G users".
27623 Ported the remaining functions that parsed p4 shell output over to the p4 python interface.
27624 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.
27625 Permit calling p4-fast-export with a depot path that has the typical ... wildcard at the end.
27626 Fixed displaying import progress by calling flush on stdout.
27627 Create a git tag for every changeset imported from perforce.
27628 Fix file permissions of p4-fast-export.py to be executable.
27629 Started working on incremental imports from Perforce.
27630 Simplify the incremental import by elimination the need for a temporary import branch.
27631 Code cleanups, move the code to create a commit with fast-import into a separate function out of the main loop.
27632 Initial support for importing a directory from Perforce at a specified revision.
27633 Minor cleanups and print an error message of git fast-import if it fails.
27634 Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import.
27635 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.
27636 Make specifying the revision ranges more convenient.
27637 Fix calculation of the newest imported revision for #head imports.
27638 Catch io exceptions from git fast-import again and print the error message.
27639 Made the name of the git branch used for the perforce import configurable through a new --branch=<name> commandline option.
27640 Added a little helper script to debug the output of the p4 python interface.
27641 Minor code cleanups.
27642 Avoid the excessive use of git tags for every perforce change and instead just create one git tag for the last imported change.
27643 Changed the default git import branch from "p4" to "master".
27644 Added a little helper script to remove unused tags from the perforce import.
27645 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.
27646 Cleanups, remove unused variable.
27648 Started work on p4 branch detection (experimental!).
27649 More fixes in heuristic p4 branch detection based on common path components.
27650 After marking a p4 branch as merged don't ever merge it in git again.
27651 Set git fast-import marks for every imported change for future use.
27652 When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent.
27653 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.
27654 Use sets.Set() instead of set() to run also with older versions of Python.
27655 Fix single-branch imports by skipping the branch/merge detection correctly.
27656 Added p4 delete behavioural emulation as todo item.
27657 Added support for --silent so that p4-fast-export can be called from cronjobs.
27658 More work in --silent support.
27659 Don't print a plain newline at the end of the execution (avoids bogus cron error mails).
27660 Adjust the output parsing of git name-rev to handle the output of the latest git version.
27661 Work in progress on detecting branches.
27662 Changed --known-branches to take a file as argument instead of a comma separated list.
27663 Fixed p4-debug file extension.
27664 Make the p4 data/command cache configurable through the --cache-debug commandline option.
27665 Minor code cleanups.
27666 More code cleanups and preparations for more branch detection heuristics.
27667 More work on branch detection by implementing changeIsBranchMerge().
27668 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.
27669 Split up the cache commandline options into (command) cache and data cache.
27670 First version of a new script to submit changes back to perforce from git repositories.
27671 Fix git-dir option and allow reading log substitutions from a file
27672 Lots of bugfixes to p4-git-sync.
27673 Automatically operate on a temporary branch, needed for cherry-pick to work when applying changes to
27674 Be nice and use /usr/bin/env python for the git-p4 scripts
27675 Ignore Apple resource files when importing from perforce to git.
27676 Auto-detect the current git branch before submitting back to perforce.
27677 Use p4 revert ... instead of revert -a ... after submitting, to make sure the p4 checkout is clean.
27678 Default to interactive syncing
27679 Improved the git dir detection.
27680 Pass the right number of arguments to commit, fixes single-branch imports.
27681 Start moving the git-p4 tools into one single script.
27682 Provide a little bit of help description for the git-p4 "tools".
27683 First (untested) attempt at migrating p4-git-sync into the final git-p4 script
27684 Part of the code is copyright by Trolltech ASA.
27685 sync-to-perforce is now called submit and fixed the gitdir check a little bit
27686 Completely untested "merge" of p4-fast-export.py into git-p4.py
27687 Added missing "self"s to make the script evaluate correctly.
27688 Fixed the initial version import by getting the file index correct by correctly skipping deleted files.
27689 Removed p4-fast-export and p4-git-sync as they've been integrated into git-p4 now.
27690 Start of the git-p4 documentation.
27691 Documentation enhancements.
27692 Added experimental but super-fast --apply-as-patch option to git-p4 submit
27693 Fix support for deletions in git-p4 submit when using --apply-as-patch by filtering out deletions in the diff-tree output.
27694 Made --apply-as-patch the default for git-p4 submit as it's significantly faster.
27695 Make it possible to invoke git-p4 from within subdirectories of a git working tree.
27696 Don't show the submit template and the diff first in less but show it in $editor right away
27697 Removed the .py extension from git-p4 as it's annoying to type every time.
27698 Changed the format of the imported log message slightly, so that it's easier to parse again.
27699 Changed the default branch for imports from "master" to "p4"
27700 Added some helper function(s) to parse the depot path and change number from the log message
27701 Helper function to check the existance of a revision
27702 Set the default branch in run, not in the constructor
27703 Brand new smart incremental import that doesn't need tags or git repo-config :)
27704 Make it possible to run git-p4 submit from within the git repository
27705 Use the new incremental import style by default
27706 Different versions of p4 have different output for the where command ;(
27707 Minor cosmetic fixlet for the git-p4 submit sync question.
27708 Prefer git command over git-command.
27709 Don't try to parse any options with git-p4 debug but pass it straight on to p4
27710 git-p4 debug doesn't need a git repository
27711 Added support for mapping p4 labels to git tags
27712 Fix variable usage in tag import
27713 Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into simply git-p4 submit mytopicbranch.
27714 Fix "compilation" :)
27715 Clean up python class names.
27716 Added git-p4 rebase convenience
27717 Provide a tree summary after git-p4 rebase
27718 Turn off potentially slow label detection by default
27719 Honor --silent for labels
27720 Added git-p4 clone convenience command
27721 Fix file determination for #head imports
27722 fix variable usage (oops)
27723 Added a simple example of usage to the "documentation" :)
27724 Allow for convenient rebasing after git-p4 submit
27725 Print an error message of some sort if git fast-import fails.
27726 Fix the timezone formatting. Now qgit also displays (parses) it correctly.
27727 Removed the old patch apply code from git-p4 submit.
27728 Slightly improved formatting of the raw_input questions.
27729 A new attempt at fixing the child-fast-import-process-not-finished race condition in the clone command
27730 Handle patch errors in git-p4 submit better.
27733 cleanup, renamed self.globalPrefix to self.depotPath
27734 Cleanup, removed the old tagging code
27735 Document some implementation details, for the curious... :)
27736 Use the subprocess module instead of popen2 to make it work on Windows.
27737 Added a little .bat wrapper from Marius
27738 Make sure all popen calls use binary mode (for Windows) and
27739 Make submitting work on Windows.
27740 Converted to unix newlines
27741 Fix git-p4 clone //depot/project (head import)
27742 Make git-p4 work with bare repositories.
27743 Added the possibility of skipping patches during git-p4 submit
27744 Give a better hint if git-p4 submit fails
27745 Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)
27746 A little todo note before I forget it :), based on a suggestion from Lars.
27747 Fixing syncing (gitdir discovery / cd) for bare repositories
27748 Always pass a sha1 for the initial parent so that git-fast-import doesn't think it's creating a new branch from itself. It's a sensible error in general but in the case of incremental imports we have to apply force :)
27749 Clean up code duplication for revision parsing and fix previous commit to not import into remotes/p4 (yet!).
27750 Removed cleantags command. It doesn't have any meaning anymore.
27751 Removed ancient and unused code to find the last imported revision from previous imports to use for the current import by looking at the p4 tags. The current approach of using the log message works better.
27752 Create the origin based import branch using git update-ref instead of git branch so that it's possible to have the import branch in refs/remotes.
27753 Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master} instead of refs/heads/p4.
27754 Bite the bullet and automatically convert old style refs/heads/p4 repositories to the new style refs/remotes/p4 branching.
27755 Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :)
27756 Removed todo item that is implemented :)
27757 Fix branch setup after initial clone.
27758 Removed unused cache variables.
27759 Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo".
27760 Give branches a nice project prefix and don't bail out on clone if we failed to detect the master branch.
27761 More work on the incremental importing of multiple branches. Improved error detection by checking the exit code of git-fast-import.
27762 Cleanup/speed up the branch<> file split and removed change range limitation that I added for debugging (oops).
27763 More cleanups and speedups for labels and branches
27764 Removed unused variable, more cleanups
27765 Cache the output of "p4 users" for faster syncs on high latency links.
27766 Fix gitdir not being set when cloning. Needed for writing the p4 users cache.
27767 Oops, not only /set/ gitdir on clone, also set it /correctly/ :)
27768 Use git format-patch and git apply --apply when extracting patches from git and applying them to a Perforce checkout. This should make it possible to apply git commits with binary files that cannot be handled by path.
27769 Added support for git-p4 submit --direct (experimental)
27770 Specifying --detect-branches is now only needed for the initial clone/sync. Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master are found.
27771 Had an idea for debugging, record it :)
27772 Another (potentially life-saving) idea for submit --direct
27773 Improved output for multi branch imports and noted another little todo item
27774 Fix conversion from old style heads/p4 to remotes/p4/master
27775 Fix error detection with git-p4 submit when the requested depot path is not in the client view.
27776 Fix git symbolic-ref warning on initial clone
27777 Detect with git-p4 submit --direct when there are no changes in the working directory
27778 Make git-p4 submit --direct safer by also creating a git commit
27779 Added a rollback command for debugging. It sets back the heads of the p4 branches to the specified p4 change number or earlier.
27780 Fix branch detection in multi-branch imports
27781 Fixes for rollback, delete branches that did not exist at the specified p4 change
27782 Added support for importing multiple branches into refs/heads instead of just refs/remotes using --import-local. Needs some further microfix but seems to work otherwise.
27783 Added support for --max-changes=<count> to ease import debugging
27784 Use refs/heads/* instead of refs/heads/p4/* for local imports
27786 Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)
27787 Make rollback work with locally imported branches
27788 Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed.
27789 Oops, fill the /list/ correct with the p4 exit code.
27790 Catch p4 errors in rollback early enough (before deleting refs!)
27791 Fix p4 execution in git-p4 rollback.
27792 Fix multi-branch import with --silent.
27793 Load the user map from p4 only once at run-time.
27794 Fix creating the remotes/p4 branches based on origin/* for the multi-branch import
27795 Forgot to remove this return statement from debugging
27796 Added support for --with-origin with multi-branch imports
27797 Oops, fix --with-origin to /really/ also call git fetch :)
27798 Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
27799 Make git-p4 work with packed refs (don't use os.path.exists to check for the existance of a ref)
27800 Make --with-origin also work without origin :)
27801 Make --with-origin the default for syncing.
27802 Shortcut the case where we have no origin branch
27803 Forgot to remove this TODO item when I made --with-origin the default :)
27804 Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)
27805 Fix creation of refs/remotes/p4/HEAD symbolic ref
27806 Fix my email address, this isn't really KDE related :)
27807 In *_pipe print the command that failed if it fails. Fixed old calls to mypopen.
27808 Fix typo in listExistingP4Branches that broke sync.
27809 Fix support for "depot-path" in older git-p4 imports
27810 Fix common path "calculation" from logs of multiple branches. Need to use min instead of max for prev/cur to avoid out-of-bounds string access. Also treat "i" as index of the last match instead of a length because in case of a complete match of the two strings i was off by one.
27811 Don't attempt to set the initialParent on multi-branch imports (useless). At some point the code paths should be unified, but for now I need a working git-p4 :)
27812 Hack to make the multi-branch import work again with self.depotPaths now that self.depotPath is gone
27815 Fix depot-path determination for git-p4 submit
27816 Make clone behave like git clone by default again.
27817 Make git-p4 submit detect the correct reference (origin) branch when working with multi-branch imports.
27818 Only get the expensive branch mapping from the p4 server when not syncing with the help of an origin remote (which we instead then use to get new branches from).
27819 Fixed the check to make sure to exclude the HEAD symbolic refs when updating the remotes/p4 branches from origin.
27820 Fix updating/creating remotes/p4/* heads from origin/p4/*
27821 Fix project name guessing
27822 Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)
27823 Fix support for explicit disabling of syncing with the origin
27824 Write out the options tag in the log message of imports only if we actually have options
27825 Provide some information for single branch imports where the commits go
27826 Mention remotes/p4/master also in the documentation.
27827 git-p4 submit: Fix missing quotes around p4 commands to make them work with spaces in filenames
27828 Moved the code from git-p4 submit to figure out the upstream branch point into a separate helper method.
27829 Fix git-p4 rebase to detect the correct upstream branch instead of unconditionally always rebasing on top of remotes/p4/master
27830 Fix initial multi-branch import.
27831 Fix the branch mapping detection to be independent from the order of the "p4 branches" output.
27832 Warn about conflicting p4 branch mappings and use the first one found.
27833 Added git-p4 branches command that shows the mapping of perforce depot paths to imported git branches.
27834 Make it possible to specify the HEAD for the internal findUpstreamBranchPoint function.
27835 git-new-workdir: Fix shell warning about operator == used with test.
27837 Sven Verdoolaege (4):
27838 git-update-ref: add --no-deref option for overwriting/detaching ref
27839 t9500: skip gitweb tests if perl version is too old
27840 git-submodule: provide easy way of adding new submodules
27841 git-clone: fetch possibly detached HEAD over dumb http
27844 Add --aggressive option to 'git gc'
27845 Fix minor grammatical typos in the git-gc man page
27846 git-mergetool: Make default selection of merge-tool more intelligent
27847 Don't fflush(stdout) when it's not helpful
27850 Change default man page path to /usr/share/man
27853 Version v1.5.2.5; changes since v1.5.2.4:
27854 -----------------------------------------
27856 Christian Couder (1):
27857 rev-list --bisect: fix allocation of "int*" instead of "int".
27859 Julian Phillips (1):
27860 Force listingblocks to be monospaced in manpages
27862 Junio C Hamano (4):
27863 Do not expect unlink(2) to fail on a directory.
27864 setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
27865 Fix "git add -u" data corruption.
27868 Linus Torvalds (1):
27869 apply: remove directory that becomes empty by renaming the last file away
27871 Salikh Zakirov (1):
27872 git-add -u paths... now works from subdirectory
27875 Version v1.5.2.4; changes since v1.5.2.3:
27876 -----------------------------------------
27879 Make git-prune submodule aware (and fix a SEGFAULT in the process)
27880 user-manual: grammar and style fixes
27883 git-gui: properly popup error if gitk should be started but is not installed
27885 J. Bruce Fields (2):
27887 user-manual: more explanation of push and pull usage
27890 Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
27892 Johannes Schindelin (3):
27893 diff --no-index: fix --name-status with added files
27894 glossary: add 'reflog'
27895 Fix "apply --reverse" with regard to whitespace
27897 Junio C Hamano (2):
27898 Teach read-tree 2-way merge to ignore intermediate symlinks
27901 Michael Hendricks (1):
27902 Correctly document the name of the global excludes file configuration
27905 Document -<n> for git-format-patch
27907 Shawn O. Pearce (10):
27908 git-gui: Unlock the index when cancelling merge dialog
27909 git-gui: Don't bind F5/M1-R in all windows
27910 git-gui: Bind M1-P to push action
27911 git-gui: Include a Push action on the left toolbar
27912 git-gui: Ensure windows shortcuts always have .bat extension
27913 git-gui: Skip nicknames when selecting author initials
27914 git-gui: Correct ls-tree buffering problem in browser
27915 git-gui: Don't linewrap within console windows
27916 Clarify documentation of fast-import's D subcommand
27917 git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
27919 William Pursell (1):
27920 user-manual: fix directory name in git-archive example
27923 Version v1.5.2.3; changes since v1.5.2.2:
27924 -----------------------------------------
27926 Frank Lichtenheld (2):
27927 config: Complete documentation of --get-regexp
27928 config: Change output of --get-regexp for valueless keys
27930 Junio C Hamano (1):
27933 Linus Torvalds (1):
27934 Fix zero-object version-2 packs
27937 Correct the name of NO_R_TO_GCC_LINKER in the comment describing it.
27940 cleanup merge-base test script
27941 repack: improve documentation on -a option
27942 git-remote: document -n
27944 Shawn O. Pearce (5):
27945 git-gui: Correctly install to /usr/bin on Cygwin
27946 git-gui: Bind Tab/Shift-Tab to cycle between panes in blame
27947 git-gui: Don't require $DISPLAY just to get --version
27948 git-gui: Don't nice git blame on MSYS as nice is not supported
27949 git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack
27951 Sven Verdoolaege (1):
27952 Ignore submodule commits when fetching over dumb protocols
27955 Version v1.5.2.2; changes since v1.5.2.1:
27956 -----------------------------------------
27959 Make the installation target of git-gui a little less chatty
27960 Fix clone to setup the origin if its name ends with .git
27961 Add a local implementation of hstrerror for the system which do not have it
27964 Fix typo in remote branch example in git user manual
27966 J. Bruce Fields (4):
27967 user-manual: quick-start updates
27968 user-manual: add a missing section ID
27969 Documentation: user-manual todo
27970 tutorial: use "project history" instead of "changelog" in header
27972 Jakub Narębski (1):
27973 Generated spec file to be ignored is named git.spec and not git-core.spec
27975 Johannes Schindelin (2):
27976 Move buffer_is_binary() to xdiff-interface.h
27977 merge-recursive: refuse to merge binary files
27980 Accept dates before 2000/01/01 when specified as seconds since the epoch
27982 Junio C Hamano (6):
27983 checkout: do not get confused with ambiguous tag/branch names
27984 $EMAIL is a last resort fallback, as it's system-wide.
27985 git-branch --track: fix tracking branch computation.
27986 Avoid diff cost on "git log -z"
27987 Documentation: adjust to AsciiDoc 8
27990 Kristian Høgsberg (1):
27991 Unquote From line from patch before comparing with given from address.
27993 Luiz Fernando N. Capitulino (1):
27994 git-cherry: Document 'limit' command-line option
27996 Matthijs Melchior (1):
27997 New selection indication and softer colors
27999 Michael Milligan (1):
28000 git-cvsimport: Make sure to use $git_dir always instead of .git sometimes
28003 fix documentation of unpack-objects -n
28004 Don't assume tree entries that are not dirs are blobs
28006 Shawn O. Pearce (47):
28007 git-gui: Allow creating a branch when none exists
28008 git-gui: Allow as few as 0 lines of diff context
28009 git-gui: Don't quit when we destroy a child widget
28010 git-gui: Attach font_ui to all spinbox widgets
28011 git-gui: Verify Tcl/Tk is new enough for our needs
28012 Revert "Make the installation target of git-gui a little less chatty"
28013 git-gui: Add a 4 digit commit abbreviation to the blame viewer
28014 git-gui: Cleanup blame::new widget initialization
28015 git-gui: Remove empty blank line at end of blame
28016 git-gui: Improve the coloring in blame viewer
28017 git-gui: Simplify consecutive lines that come from the same commit
28018 git-gui: Use arror cursor in blame viewer file data
28019 git-gui: Display tooltips in blame viewer
28020 git-gui: Highlight the blame commit header from everything else
28021 git-gui: Remove unnecessary reshow of blamed commit
28022 git-gui: Cleanup minor style nit
28023 git-gui: Space the commit group continuation out in blame view
28024 git-gui: Show author initials in blame groups
28025 git-gui: Allow the user to control the blame/commit split point
28026 git-gui: Display a progress bar during blame annotation gathering
28027 git-gui: Allow digging through history in blame viewer
28028 git-gui: Combine blame groups only if commit and filename match
28029 git-gui: Show original filename in blame tooltip
28030 git-gui: Use a label instead of a button for the back button
28031 git-gui: Clip the commit summaries in the blame history menu
28032 git-gui: Remove the loaded column from the blame viewer
28033 git-gui: Remove unnecessary space between columns in blame viewer
28034 git-gui: Use lighter colors in blame view
28035 git-gui: Make the line number column slightly wider in blame
28036 git-gui: Automatically expand the line number column as needed
28037 git-gui: Remove unused commit_list from blame viewer
28038 git-gui: Better document our blame variables
28039 git-gui: Cleanup redundant column management in blame viewer
28040 git-gui: Switch internal blame structure to Tcl lists
28041 git-gui: Label the uncommitted blame history entry
28042 git-gui: Rename fields in blame viewer to better descriptions
28043 git-gui: Display the "Loading annotation..." message in italic
28044 git-gui: Run blame twice on the same file and display both outputs
28045 git-gui: Display both commits in our tooltips
28046 git-gui: Jump to original line in blame viewer
28047 git-gui: Use three colors for the blame viewer background
28048 git-gui: Improve our labeling of blame annotation types
28049 git-gui: Favor the original annotations over the recent ones
28050 git-gui: Changed blame header bar background to match main window
28051 git-gui: Include 'war on whitespace' fixes from git.git
28052 git-gui: Give amend precedence to HEAD over MERGE_MSG
28053 git-gui: Save geometry before the window layout is damaged
28055 William Pursell (1):
28056 Make command description imperative statement, not third-person present.
28059 Version v1.5.2.1; changes since v1.5.2:
28060 ---------------------------------------
28063 Fix mishandling of $Id$ expanded in the repository copy in convert.c
28064 Add test case for $Id$ expanded in the repository
28067 fix memory leak in parse_object when check_sha1_signature fails
28070 git-svn: avoid md5 calculation entirely if SVN doesn't provide one
28072 Fernando J. Pereda (1):
28073 Use PATH_MAX instead of TEMPFILE_PATH_LEN
28075 Frank Lichtenheld (7):
28076 t1300: Add tests for git-config --bool --get
28077 git-config: Correct asciidoc documentation for --int/--bool
28078 cvsserver: Correct inetd.conf example in asciidoc documentation
28079 cvsserver: Note that CVS_SERVER can also be specified as method variable
28080 cvsserver: Fix some typos in asciidoc documentation
28081 git-config: Various small fixes to asciidoc documentation
28082 git-config: Improve documentation of git-config file handling
28084 Jakub Narębski (3):
28085 Documentation: Clean up links in GIT Glossary
28086 Replace the last 'dircache's by 'index'
28087 Documentation: Add definition of "evil merge" to GIT Glossary
28090 Documentation: fix git-config.xml generation
28092 James Y Knight (1):
28093 Fix git-svn to handle svn not reporting the md5sum of a file, and test.
28096 git-am: use printf instead of echo on user-supplied strings
28097 More echo "$user_message" fixes.
28098 Documentation: robustify asciidoc GIT_VERSION replacement
28100 Jerald Fitzjerald (1):
28101 decode_85(): fix missing return.
28104 git-daemon: don't ignore pid-file write failure
28107 Fix stupid typo in lookup_tag()
28109 Johannes Schindelin (2):
28110 SubmittingPatches: mention older C compiler compatibility
28111 git-status: respect core.excludesFile
28114 branch: fix segfault when resolving an invalid HEAD
28115 Update bash completion to ignore some more plumbing commands
28118 Create a new manpage for the gitignore format, and reference it elsewhere
28120 Junio C Hamano (6):
28121 annotate: make it work from subdirectories.
28122 git-cvsserver: fix disabling service via per-method config
28123 name-rev: tolerate clock skew in committer dates
28124 git-commit: use printf '%s\n' instead of echo on user-supplied strings
28125 Add tests for the last two fixes.
28128 Kristian Høgsberg (1):
28129 Use =20 when rfc2047 encoding spaces.
28131 Linus Torvalds (1):
28132 fix signed range problems with hex conversions
28134 Nguyễn Thái Ngọc Duy (1):
28135 Makefile: Remove git-fsck and git-verify-pack from PROGRAMS
28138 Document branch.autosetupmerge.
28140 Shawn O. Pearce (12):
28141 git-gui: Tighten internal pattern match for lib/ directory
28142 Refactor fast-import branch creation from existing commit
28143 Fix possible coredump with fast-import --import-marks
28144 Hide the plumbing diff-{files,index,tree} from bash completion
28145 Teach bash completion about git-shortlog
28146 Remove a duplicate --not option in bash completion
28147 Update bash completion header documentation
28148 Teach bash completion about 'git remote update'
28149 Teach bash completion about recent log long options
28150 Update bash completion for git-config options
28151 Correct key bindings to Control-<foo>
28152 git-gui: Guess our share/git-gui/lib path at runtime if possible
28154 Simon Hausmann (2):
28155 fast-import: Fix uninitialized variable
28156 fast-import: Fix crash when referencing already existing objects
28158 Steffen Prohaska (1):
28159 user-manual: fixed typo in example
28161 Stephan Springl (1):
28162 Use git-for-each-ref to check whether the origin branch exists.
28164 Sven Verdoolaege (1):
28165 unpack-trees.c: verify_uptodate: remove dead code
28168 Version v1.5.2; changes since v1.5.2-rc3:
28169 -----------------------------------------
28172 Allow fetching references from any namespace
28175 Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent with other VCSs
28176 Fix crlf attribute handling to match documentation
28178 Andy Whitcroft (1):
28179 git name-rev writes beyond the end of malloc() with large generations
28182 git-svn: don't drop the username from URLs when dcommit is run
28183 git-svn: clean up caching of SVN::Ra functions
28184 git-svn: fix segfaults due to initial SVN pool being cleared
28185 git-svn: don't attempt to minimize URLs by default
28186 git-svn: avoid crashing svnserve when creating new directories
28187 git-svn: don't minimize-url when doing an init that tracks multiple paths
28189 Frank Lichtenheld (5):
28190 cvsserver: Limit config parser to needed options
28191 cvsserver: Don't send mixed messages to clients
28192 builtin-log.c: Fix typo in comment
28193 Documentation: format-patch has no --mbox option
28194 git-am: Clean up the asciidoc documentation
28196 J. Bruce Fields (14):
28197 user-manual: revise birdseye-view chapter
28198 glossary: expand and clarify some definitions, prune cross-references
28199 user-manual: move quick-start to an appendix
28200 Documentation: remove howto's now incorporated into manual
28201 user-manual: move howto/make-dist.txt into user manual
28202 user-manual: move howto/using-topic-branches into manual
28203 user-manual: add a "counting commits" example
28204 user-manual: introduce git
28205 user-manual: listing commits reachable from some refs not others
28206 user-manual: reorganize public git repo discussion
28207 tutorials: add user-manual links
28208 tutorial: revise index introduction
28209 user-manual: discourage shared repository
28210 user-manual: finding commits referencing given file content
28212 Jakub Narębski (10):
28213 gitweb: Test if $from_id and $to_id are defined before comparison
28214 gitweb: Check if requested object exists
28215 gitweb: Fix "Use of unitialized value" warnings in empty repository
28216 Documentation: Split description of pretty formats of commit log
28217 gitweb: Add a few comments about %feature hash
28218 gitweb: Do not use absolute font sizes
28219 gitweb: Separate search regexp from search text
28220 gitweb: Empty patch for merge means trivial merge, not no differences
28221 gitweb: Fix error in git_patchset_body for deletion in merge commit
28222 gitweb: Fix "Use of uninitialized value" warning in git_feed
28225 Updated documentation of hooks in git-receive-pack.
28226 Minor fixup to documentation of hooks in git-receive-pack.
28229 git-add: allow path limiting with -u
28230 Documentation/git-add: clarify -u with path limiting
28231 format-patch: add MIME-Version header when we add content-type.
28234 Fix signedness on return value from xread()
28235 Ensure return value from xread() is always stored into an ssize_t
28236 user-manual: Add section on ignoring files
28238 Johannes Schindelin (2):
28239 import-tars: Use the "Link indicator" to identify directories
28240 Add a birdview-on-the-source-code section to the user manual
28242 Junio C Hamano (17):
28243 Minor copyediting on Release Notes for 1.5.2
28244 Add has_symlink_leading_path() function.
28245 apply: do not get confused by symlinks in the middle
28246 read-tree -m -u: avoid getting confused by intermediate symlinks.
28247 t9400: Use the repository config and nothing else.
28248 checkout: allow detaching to HEAD even when switching to the tip of a branch
28249 git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
28250 Link to HTML version of external doc if available
28251 Fix git-clone buglet for remote case.
28252 Prepare for 1.5.1.5 Release Notes
28253 gitweb: fix another use of undefined value
28255 Add link to 1.5.1.5 release notes.
28256 Documentation/git.txt: Update links to older documentation pages.
28258 git-cvsserver: exit with 1 upon "I HATE YOU"
28262 git-archive: don't die when repository uses subprojects
28264 Marco Costalba (1):
28265 Fix an unmatched comment end in arm/sha1_arm.S
28267 Matthias Kestenholz (2):
28268 Documentation: Added [verse] to SYNOPSIS where necessary
28269 Documentation: Reformatted SYNOPSIS for several commands
28271 Matthieu Castet (1):
28272 Remove stale non-static-inline prototype for tree_entry_extract()
28274 Michael Hendricks (2):
28275 git-send-email: allow leading white space on mutt aliases
28276 Document core.excludesfile for git-add
28279 gitweb: Normalize searchbar font size
28280 gitweb: Add support for grep searches
28281 gitweb: Allow arbitrary strings to be dug with pickaxe
28282 Documentation: git-rev-list's "patterns"
28283 gitweb: Remove redundant $searchtype setup
28286 RPM spec: include files in technical/ to package.
28287 Documentation/branch: fix small typo in -D example
28290 git-archive: convert archive entries like checkouts do
28292 Shawn O. Pearce (1):
28293 git-gui: Gracefully handle bad TCL_PATH at compile time
28295 Steffen Prohaska (4):
28296 tiny fix in documentation of git-clone
28297 git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
28298 Optimized cvsexportcommit: calling 'cvs status' once instead of once per touched file.
28299 Fixed link in user-manual
28302 Version v1.5.2-rc3; changes since v1.5.2-rc2:
28303 ---------------------------------------------
28306 Use GIT_OBJECT_DIR for temporary files of pack-objects
28308 Amos Waterland (1):
28309 wcwidth redeclaration
28311 Frank Lichtenheld (1):
28312 cvsserver: Add test cases for git-cvsserver
28315 gitweb: choose appropriate view for file type if a= parameter missing
28317 J. Bruce Fields (7):
28318 user-manual: more discussion of detached heads, fix typos
28319 user-manual: add section ID's
28320 user-manual: clean up fast-forward and dangling-objects sections
28321 user-manual: fix .gitconfig editing examples
28322 user-manual: miscellaneous editing
28323 user-manual: stop deprecating the manual
28324 user-manual: fix clone and fetch typos
28326 Jakub Narębski (6):
28327 gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line
28328 gitweb: Add combined diff support to git_difftree_body
28329 gitweb: Add combined diff support to git_patchset_body
28330 gitweb: Make it possible to use pre-parsed info in git_difftree_body
28331 gitweb: Show combined diff for merge commits in 'commitdiff' view
28332 gitweb: Show combined diff for merge commits in 'commit' view
28335 SPECIFYING RANGES typo fix: it it => it is
28338 Documentation: don't reference non-existent 'git-cvsapplycommit'
28341 git-gui: Call changes "Staged" and "Unstaged" in file list titles.
28343 Junio C Hamano (10):
28344 diff: release blobs after generating textual diff.
28345 diff.c: do not use a separate "size cache".
28346 diff -M: release the preimage candidate blobs after rename detection.
28347 diff -S: release the image after looking for needle in it
28349 Update documentation links to point at 1.5.1.4
28350 t9400: skip cvsserver test if Perl SQLite interface is unavailable
28351 git-clone: don't get fooled by $PWD
28352 .mailmap: add some aliases
28356 Document git add -u introduced earlier.
28357 Added a reference to git-add in the documentation for git-update-index
28359 Michael Hendricks (1):
28360 Document 'git-log --decorate'
28363 dir.c: Omit non-excluded directories with dir->show_ignored
28364 t7300: Basic tests for git-clean
28365 Fix minor documentation errors
28367 Paul Mackerras (1):
28368 gitk: Allow user to choose whether to see the diff, old file, or new file
28371 Git.pm: config_boolean() -> config_bool()
28372 gitweb: Do not use absolute font sizes
28375 Add howto files to rpm packages.
28376 Added new git-gui library files to rpm spec
28378 Richard P. Curnow (2):
28379 Fix documentation of tag in git-fast-import.txt
28380 Fix documentation of tag in git-fast-import.txt
28382 Shawn O. Pearce (32):
28383 git-gui: Correctly handle UTF-8 encoded commit messages
28384 git-gui: Allow spaces in path to 'wish'
28385 git-gui: Include the subject in the status bar after commit
28386 git-gui: Warn users before making an octopus merge
28387 git-gui: Correct line wrapping for too many branch message
28388 git-gui: Cleanup common font handling for font_ui
28389 git-gui: Use option database defaults to set the font
28390 git-gui: Refactor to use our git proc more often
28391 git-gui: Track our own embedded values and rebuild when they change
28392 Properly handle '0' filenames in import-tars
28393 git-gui: Refactor into multiple files to save my sanity
28394 git-gui: Move console procs into their own namespace
28395 git-gui: Allow vi keys to scroll the diff/blame regions
28396 git-gui: Move merge support into a namespace
28397 git-gui: Show all possible branches for merge
28398 git-gui: Include commit id/subject in merge choices
28399 git-gui: Use vi-like keys in merge dialog
28400 Remove duplicate exports from Makefile
28401 git-gui: Allow shift-{k,j} to select a range of branches to merge
28402 git-gui: Define a simple class/method system
28403 git-gui: Convert browser, console to "class" format
28404 git-gui: Don't attempt to inline array reads in methods
28405 git-gui: Convert blame to the "class" way of doing things
28406 git-gui: Use prefix if blame is run in a subdirectory
28407 git-gui: Smarter command line parsing for browser, blame
28408 git-gui: Generate blame on uncommitted working tree file
28409 git-gui: Cleanup minor nits in blame code
28410 git-gui: Format author/committer times in ISO format
28411 Use .git/MERGE_MSG in cherry-pick/revert
28412 git-gui: Paperbag fix blame in subdirectory
28414 Correct error message in revert/cherry-pick
28417 Add pack.depth option to git-pack-objects.
28418 Increase pack.depth default to 50
28421 Version v1.5.2-rc2; changes since v1.5.2-rc1:
28422 ---------------------------------------------
28425 Small correction in reading of commit headers
28426 Handle return code of parse_commit in revision machinery
28428 Alexandre Julliard (1):
28429 http-fetch: Disable use of curl multi support for libcurl < 7.16.
28431 Arjen Laarhoven (1):
28432 Document 'opendiff' value in config.txt and git-mergetool.txt
28435 Allow PERL_PATH="/usr/bin/env perl"
28436 posix compatibility for t4200
28439 Mention version 1.5.1 in tutorial and user-manual
28442 Create pack-write.c for common pack writing code
28444 Daniel Barkalow (1):
28445 Make xstrndup common
28447 Frank Lichtenheld (1):
28448 cvsserver: Handle re-added files correctly
28450 Jakub Narębski (1):
28451 diff format documentation: describe raw combined diff format
28454 Documentation: fix typo in git-remote.txt
28456 Johannes Schindelin (1):
28457 Teach import-tars about GNU tar's @LongLink extension.
28460 git-tag(1): -v option is a subcommand; fix code block
28462 Junio C Hamano (6):
28463 blame: use .mailmap unconditionally
28464 diff.c: fix "size cache" handling.
28465 blame: Notice a wholesale incorporation of an existing file.
28467 Add test for blame corner cases.
28470 Karl Hasselström (2):
28471 Fix markup in git-svn man page
28472 Add --no-rebase option to git-svn dcommit
28474 Linus Torvalds (1):
28475 Fix --boundary output
28477 Martin Koegler (1):
28478 Fix compilation of test-delta
28480 Shawn O. Pearce (3):
28481 Reuse fixup_pack_header_footer in index-pack
28482 Don't use seq in tests, not everyone has it
28483 Improve request-pull to handle non-rebased branches
28486 gitweb: use decode_utf8 directly
28489 Version v1.5.2-rc1; changes since v1.5.2-rc0:
28490 ---------------------------------------------
28493 Remove usernames from all commit messages, not just when using svmprops
28494 git-svn: Don't rely on $_ after making a function call
28495 git-svn: Ignore usernames in URLs in find_by_url
28496 git-svn: Added 'find-rev' command
28497 git-svn: Add 'find-rev' command
28500 Fix handle leak in write_tree
28501 Avoid excessive rewrites in merge-recursive
28502 Add a test for merging changed and rename-changed branches
28503 Ignore merged status of the file-level merge
28504 Use strlcpy instead of strncpy in mailmap.c
28505 Fix read_mailmap to handle a caller uninterested in repo abbreviation
28506 Remove pointless calls to access(2) when checking for .mailmap
28507 Include mailmap.h in mailmap.c to catch mailmap interface changes
28510 Removing -n option from git-diff-files documentation
28511 Document additional options for git-fetch
28512 Update git-fmt-merge documentation
28513 Update git-grep documentation
28514 Update -L documentation for git-blame/git-annotate
28515 Update git-http-push documentation
28516 Update git-local-fetch documentation
28517 Update git-http-fetch documentation
28520 post-receive-email example hook: fastforward should have been fast_forward
28521 post-receive-email example hook: detect rewind-only updates and output sensible message
28522 post-receive-email example hook: sed command for getting description was wrong
28524 Brian Gernhardt (2):
28525 Reverse the order of -b and --track in the man page.
28526 Ignore all man sections as they are generated files.
28529 Documentation/git-reset.txt: suggest git commit --amend in example.
28532 Clarify SubmittingPatches Checklist
28533 git.7: Mention preformatted html doc location
28534 send-email documentation: clarify --smtp-server
28536 Johannes Schindelin (3):
28537 dir.c(common_prefix): Fix two bugs
28538 t4201: Do not display weird characters on the terminal
28539 import-tars: be nice to wrong directory modes
28542 Add clean.requireForce option, and add -f option to git-clean to override it
28543 Fix typo in git-am: s/Was is/Was it/
28544 Create a sysconfdir variable, and use it for ETC_GITCONFIG
28545 Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
28546 Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL
28548 Julian Phillips (1):
28549 http.c: Fix problem with repeated calls of http_init
28551 Junio C Hamano (25):
28552 Move index-related variables into a structure.
28553 Make read-cache.c "the_index" free.
28554 Document "diff=driver" attribute
28555 t5302: avoid using tail -c
28556 t6030: grab commit object name as we go
28557 Build RPM with ETC_GITCONFIG=/etc/gitconfig
28558 Diff between two blobs should take mode changes into account now.
28559 t/test-lib.sh: Protect ourselves from common misconfiguration that exports CDPATH to the environment
28560 gitattributes documentation: clarify overriding
28561 applymbox & quiltimport: typofix.
28562 Add 'ident' conversion.
28563 Add 'filter' attribute and external filter driver definition.
28564 Add --date={local,relative,default}
28565 Start preparing for 1.5.1.3
28566 Do not barf on too long action description
28567 Update .mailmap with "Michael"
28568 Fix import-tars fix.
28569 blame -s: suppress author name and time.
28570 Split out mailmap handling out of shortlog
28571 Apply mailmap in git-blame output.
28572 Make macros to prevent double-inclusion in headers consistent.
28573 Make sure test-genrandom and test-chmtime are builtas part of the main build.
28574 Fix symlink handling in git-svn, related to PerlIO
28578 Luiz Fernando N. Capitulino (5):
28579 remove_subtree(): Use strerror() when possible
28580 entry.c: Use const qualifier for 'struct checkout' parameters
28581 read_cache_from(): small simplification
28582 core-tutorial: minor fixes
28583 init_buffer(): Kill buf pointer
28585 Martin Koegler (5):
28586 Add S_IFINVALID mode
28587 add get_sha1_with_mode
28588 add add_object_array_with_mode
28589 store mode in rev_list, if <tree>:<filename> syntax is used
28590 use mode of the tree in git-diff, if <tree>:<file> syntax is used
28592 Michele Ballabio (1):
28593 git shortlog documentation: add long options and fix a typo
28596 add file checkout progress
28598 OGAWA Hirofumi (1):
28599 git-fetch: Fix "argument list too long"
28601 Robin H. Johnson (10):
28602 Document --dry-run parameter to send-email.
28603 Prefix Dry- to the message status to denote dry-runs.
28604 Debugging cleanup improvements
28605 Change the scope of the $cc variable as it is not needed outside of send_message.
28606 Perform correct quoting of recipient names.
28607 Validate @recipients before using it for sendmail and Net::SMTP.
28608 Ensure clean addresses are always used with Net::SMTP
28609 Allow users to optionally specify their envelope sender.
28610 Document --dry-run and envelope-sender for git-send-email.
28611 Sanitize @to recipients.
28614 fast-import: size_t vs ssize_t
28616 Shawn O. Pearce (4):
28617 Don't repack existing objects in fast-import
28618 Actually handle some-low memory conditions
28619 Don't allow empty pathnames in fast-import
28620 Catch empty pathnames in trees during fsck
28622 Uwe Kleine-König (1):
28623 fix importing of subversion tars
28626 Version v1.5.2-rc0; changes since v1.5.1.6:
28627 -------------------------------------------
28630 Fix passing of TCLTK_PATH to git-gui
28631 Fix t4201: accidental arithmetic expansion
28632 Fix permissions on test scripts
28633 Tests for core subproject support
28634 Simplify calling of CR/LF conversion routines
28635 Fix a typo in crlf conversion code
28636 Fix crash in t0020 (crlf conversion)
28638 Alexandre Julliard (1):
28639 git.el: Add a commit description to the reflog.
28642 Add policy on user-interface changes
28645 Show binary file size change in diff --stat
28647 Aneesh Kumar K.V (1):
28648 gitview: annotation support
28650 Brian Gernhardt (2):
28651 Remove unused WITH_OWN_SUBPROCESS_PY from RPM spec
28652 Remove case-sensitive file in t3030-merge-recursive.
28654 Christian Couder (4):
28655 Bisect: teach "bisect start" to optionally use one bad and many good revs.
28656 Documentation: bisect: "start" accepts one bad and many good commits
28657 Bisect: simplify "bisect start" logging.
28658 Bisect: rename "t/t6030-bisect-run.sh" to "t/t6030-bisect-porcelain.sh".
28661 git-svn: bail out on incorrect command-line options
28663 Eygene Ryabinkin (11):
28664 Add the WITH_P4IMPORT knob to the Makefile.
28665 Added git-p4 package to the list of git RPMs.
28666 Added correct Python path to the RPM specfile.
28668 Add --with-tcltk and --without-tcltk to configure.
28669 Rewrite Tcl/Tk interpreter path for the GUI tools.
28670 Eliminate checks of user-specified Tcl/Tk interpreter.
28671 Allow wish interpreter to be defined with TCLTK_PATH
28672 Teach git-gui to use the user-defined UI font everywhere.
28673 Improve look-and-feel of the git-gui tool.
28674 Do not break git-gui messages into multiple lines.
28676 Fernando J. Pereda (1):
28677 Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
28679 Frank Lichtenheld (16):
28680 cvsserver: Introduce new state variable 'method'
28681 cvsserver: Handle three part keys in git config correctly
28682 cvsserver: Allow to override the configuration per access method
28683 cvsserver: Make the database backend configurable
28684 cvsserver: Abort if connect to database fails
28685 Documentation: Replace @@GIT_VERSION@@ in documentation
28686 Documentation: Add version information to man pages
28687 cvsserver: Use DBI->table_info instead of DBI->tables
28688 cvsserver: Corrections to the database backend configuration
28689 cvsserver: Add asciidoc documentation for new database backend configuration
28690 gitweb: Allow forks with project list file
28691 gitweb: Allow configuring the default projects order and add order 'none'
28692 cvsserver: Allow to "add" a removed file
28693 cvsserver: Reword documentation on necessity of write access
28694 cvsserver: Document the GIT branches -> CVS modules mapping more prominently
28695 config.txt: Add gitcvs.db* variables
28697 Jakub Narębski (2):
28698 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (3)
28699 gitweb: Quote hash keys, and do not use barewords keys
28702 Document git-check-attr
28705 sscanf/strtoul: parse integers robustly
28707 Johannes Schindelin (1):
28708 Use print_wrapped_text() in shortlog
28710 Julian Phillips (1):
28711 refs.c: add a function to sort a ref list, rather then sorting on add
28713 Junio C Hamano (83):
28714 git-fetch: add --quiet
28715 t6002: minor spelling fix.
28716 git-rev-list: add --bisect-vars option.
28717 git-rev-list --bisect: optimization
28718 t6004: add a bit more path optimization test.
28719 rev-list --bisect: Fix "halfway" optimization.
28720 make the previous optimization work also on path-limited rev-list --bisect
28721 Documentation: unbreak user-manual.
28722 Optional Tck/Tk: ignore generated files.
28723 checkout: allow detaching to HEAD even when switching to the tip of a branch
28724 _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
28725 git-read-tree --index-output=<file>
28726 add_cache_entry(): removal of file foo does not conflict with foo/bar
28727 unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
28728 unpack-trees: get rid of *indpos parameter.
28729 Fix read-tree --prefix=dir/.
28730 Fix twoway_merge that passed d/f conflict marker to merged_entry().
28731 Fix switching to a branch with D/F when current branch has file D.
28732 RPM spec: include git-p4 in the list of all packages.
28733 Fix bogus error message from merge-recursive error path
28734 Propagate cache error internal to refresh_cache() via parameter.
28735 Rename internal function "add_file_to_cache" in builtin-update-index.c
28736 Rename static variable write_index to update_index in builtin-apply.c
28737 Rename add_file_to_index() to add_file_to_cache()
28738 git-bisect: modernization
28739 t6030: add a bit more tests to git-bisect
28740 git-bisect: allow bisecting with only one bad commit.
28741 git-push reports the URL after failing.
28742 git-push to multiple locations does not stop at the first failure
28743 A new merge stragety 'subtree'.
28744 Start 1.5.2 cycle by prepareing RelNotes for it.
28745 shortlog -w: make wrap-line behaviour optional.
28746 t1000: fix case table.
28747 Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
28748 merge-recursive: do not barf on "to be removed" entries.
28749 merge-recursive: handle D/F conflict case more carefully.
28750 t3030: merge-recursive backend test.
28751 git-fetch--tool pick-rref
28752 git-fetch: use fetch--tool pick-rref to avoid local fetch from alternate
28753 Add %m to '--pretty=format:'
28754 Refactor patch-id filtering out of git-cherry and git-format-patch.
28755 git-log --cherry-pick A...B
28756 Documentation: --cherry-pick
28757 Fix git {log,show,...} --pretty=email
28758 Add basic infrastructure to assign attributes to paths
28759 Define 'crlf' attribute.
28760 Teach 'diff' about 'diff' attribute.
28761 Fix 'crlf' attribute semantics.
28762 Fix 'diff' attribute semantics.
28763 Makefile: add patch-ids.h back in.
28764 attribute macro support
28765 Define a built-in attribute macro "binary".
28766 Change attribute negation marker from '!' to '-'.
28767 send-email: do not leave an empty CC: line if no cc is present.
28768 Make sure quickfetch is not fooled with a previous, incomplete fetch.
28769 Allow more than true/false to attributes.
28770 merge-recursive: separate out xdl_merge() interface.
28771 git-gui: Honor TCLTK_PATH if supplied
28772 Allow specifying specialized merge-backend per path.
28773 Add a demonstration/test of customized merge.
28774 Update draft release notes for 1.5.2 with accumulated changes.
28775 Custom low-level merge driver support.
28776 Allow the default low-level merge driver to be configured.
28777 Custom low-level merge driver: change the configuration scheme.
28778 Allow low-level driver to specify different behaviour during internal merge.
28779 Fix funny types used in attribute value representation
28780 Counto-fix in merge-recursive
28781 Simplify code to find recursive merge driver.
28782 Documentation: support manual section (5) - file formats.
28783 Update 'crlf' attribute semantics.
28784 Document gitattributes(5)
28785 git-add -u: match the index with working tree.
28786 Fix bogus linked-list management for user defined merge drivers.
28787 convert.c: restructure the attribute checking part.
28788 lockfile: record the primary process.
28789 Update documentation links to point at v1.5.1.2
28790 Documentation/Makefile: fix section (5) installation
28791 Update draft release notes for v1.5.2
28792 pack-objects: quickfix for permission modes.
28793 Fix 'quickfix' on pack-objects.
28794 Update tests not to assume that generated packfiles are writable.
28795 pack-objects: make generated packfile read-only
28796 Support 'diff=pgm' attribute
28798 Linus Torvalds (24):
28799 Optimize directory listing with pathspec limiter.
28800 diff-lib: use ce_mode_from_stat() rather than messing with modes manually
28801 Avoid overflowing name buffer in deep directory structures
28802 Add 'resolve_gitlink_ref()' helper function
28803 Add "S_IFDIRLNK" file mode infrastructure for git links
28804 Teach "fsck" not to follow subproject links
28805 Teach core object handling functions about gitlinks
28806 Fix thinko in subproject entry sorting
28807 Teach directory traversal about subprojects
28808 Teach git-update-index about gitlinks
28809 Don't show gitlink directories when we want "other" files
28810 Teach git list-objects logic not to follow gitlinks
28811 Teach "git-read-tree -u" to check out submodules as a directory
28812 Fix gitlink index entry filesystem matching
28813 Teach git list-objects logic to not follow gitlinks
28814 Teach "git-read-tree -u" to check out submodules as a directory
28815 Fix some "git ls-files -o" fallout from gitlinks
28816 Expose subprojects as special files to "git diff" machinery
28817 Add a generic "object decorator" interface, and make object refs use it
28818 Add support for "commit name decorations" to log family of commands
28819 Use proper object allocators for unknown object nodes too
28820 Clean up object creation to use more common code
28821 Fix working directory errno handling when unlinking a directory
28822 Fix a copy-n-paste bug in the object decorator code.
28824 Luiz Fernando N. Capitulino (2):
28825 ident.c: Use const qualifier for 'struct passwd' parameters
28826 ident.c: Use size_t (instead of int) to store sizes
28828 Martin Koegler (1):
28829 gitweb: Show "no difference" message for empty diff
28831 Michael S. Tsirkin (1):
28832 Display the subject of the commit just made.
28834 Nicolas Pitre (32):
28835 clean up and optimize nth_packed_object_sha1() usage
28836 get rid of num_packed_objects()
28837 make overflow test on delta base offset work regardless of variable size
28838 add overflow tests on pack offset variables
28839 compute a CRC32 for each object as stored in a pack
28840 compute object CRC32 with index-pack
28841 pack-objects: learn about pack index version 2
28842 index-pack: learn about pack index version 2
28843 sha1_file.c: learn about index version 2
28844 show-index.c: learn about index v2
28845 pack-redundant.c: learn about index v2
28846 allow forcing index v2 and 64-bit offset treshold
28847 validate reused pack data with CRC when possible
28848 simple random data generator for tests
28849 use test-genrandom in tests instead of /dev/urandom
28850 tests for various pack index features
28851 clean up add_object_entry()
28852 pack-objects: optimize preferred base handling a bit
28853 pack-objects: equal objects in size should delta against newer objects
28854 pack-objects: rework check_delta_limit usage
28855 pack-objects: clean up list sorting
28856 pack-objects: get rid of reuse_cached_pack
28857 pack-objects: get rid of create_final_object_list()
28858 pack-objects: make in_pack_header_size a variable of its own
28859 add get_size_from_delta()
28860 pack-objects: better check_object() performances
28861 pack-objects: remove obsolete comments
28862 document --index-version for index-pack and pack-objects
28863 common progress display support
28864 make progress "title" part of the common progress interface
28865 provide a facility for "delayed" progress reporting
28866 delay progress display when checking out files
28869 git-archive: make tar the default format
28871 Robin H. Johnson (2):
28872 Add custom subject prefix support to format-patch (take 3)
28873 Add testcase for format-patch --subject-prefix (take 3)
28875 Shawn O. Pearce (8):
28876 Always bind the return key to the default button
28877 Fix lost-found to show commits only referenced by reflogs
28878 Don't yap about merge-subtree during make
28879 git-gui: Display the directory basename in the title
28880 Revert "Allow wish interpreter to be defined with TCLTK_PATH"
28881 Contribute a fairly paranoid update hook
28882 Kill the useless progress meter in merge-recursive
28883 Cleanup variables in cat-file
28886 Add --quiet option to suppress output of "rm" commands for removed files.
28887 git-rm: Trivial fix for a comment typo.
28888 Add --ignore-unmatch option to exit with zero status when no files are removed.
28890 Xavier Maillard (2):
28891 git-blame.el: separate git-blame-mode to ease maintenance
28892 git-blame.el: pick a set of random colors for each git-blame turn
28895 Version v1.5.1.6; changes since v1.5.1.5:
28896 -----------------------------------------
28899 git-svn: avoid crashing svnserve when creating new directories
28900 git-svn: don't minimize-url when doing an init that tracks multiple paths
28902 J. Bruce Fields (4):
28903 tutorials: add user-manual links
28904 tutorial: revise index introduction
28905 user-manual: discourage shared repository
28906 user-manual: finding commits referencing given file content
28909 user-manual: Add section on ignoring files
28911 Junio C Hamano (1):
28914 Matthias Kestenholz (2):
28915 Documentation: Added [verse] to SYNOPSIS where necessary
28916 Documentation: Reformatted SYNOPSIS for several commands
28919 Version v1.5.1.5; changes since v1.5.1.4:
28920 -----------------------------------------
28923 Allow fetching references from any namespace
28925 Andy Whitcroft (1):
28926 git name-rev writes beyond the end of malloc() with large generations
28929 git-svn: don't drop the username from URLs when dcommit is run
28930 git-svn: clean up caching of SVN::Ra functions
28931 git-svn: fix segfaults due to initial SVN pool being cleared
28932 git-svn: don't attempt to minimize URLs by default
28934 Frank Lichtenheld (3):
28935 builtin-log.c: Fix typo in comment
28936 Documentation: format-patch has no --mbox option
28937 git-am: Clean up the asciidoc documentation
28939 J. Bruce Fields (10):
28940 user-manual: revise birdseye-view chapter
28941 glossary: expand and clarify some definitions, prune cross-references
28942 user-manual: move quick-start to an appendix
28943 Documentation: remove howto's now incorporated into manual
28944 user-manual: move howto/make-dist.txt into user manual
28945 user-manual: move howto/using-topic-branches into manual
28946 user-manual: add a "counting commits" example
28947 user-manual: introduce git
28948 user-manual: listing commits reachable from some refs not others
28949 user-manual: reorganize public git repo discussion
28951 Jakub Narębski (1):
28952 gitweb: Add a few comments about %feature hash
28955 Updated documentation of hooks in git-receive-pack.
28958 SPECIFYING RANGES typo fix: it it => it is
28961 format-patch: add MIME-Version header when we add content-type.
28963 Johannes Schindelin (2):
28964 import-tars: Use the "Link indicator" to identify directories
28965 Add a birdview-on-the-source-code section to the user manual
28967 Junio C Hamano (7):
28968 git-clone: don't get fooled by $PWD
28969 .mailmap: add some aliases
28970 checkout: allow detaching to HEAD even when switching to the tip of a branch
28971 git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
28972 Fix git-clone buglet for remote case.
28973 Prepare for 1.5.1.5 Release Notes
28976 Marco Costalba (1):
28977 Fix an unmatched comment end in arm/sha1_arm.S
28979 Matthieu Castet (1):
28980 Remove stale non-static-inline prototype for tree_entry_extract()
28982 Michael Hendricks (2):
28983 git-send-email: allow leading white space on mutt aliases
28984 Document core.excludesfile for git-add
28987 Documentation: git-rev-list's "patterns"
28990 RPM spec: include files in technical/ to package.
28991 Documentation/branch: fix small typo in -D example
28993 Richard P. Curnow (2):
28994 Fix documentation of tag in git-fast-import.txt
28995 Fix documentation of tag in git-fast-import.txt
28997 Shawn O. Pearce (1):
28998 Properly handle '0' filenames in import-tars
29000 Steffen Prohaska (3):
29001 tiny fix in documentation of git-clone
29002 git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
29003 Fixed link in user-manual
29006 Version v1.5.1.4; changes since v1.5.1.3:
29007 -----------------------------------------
29010 Small correction in reading of commit headers
29012 Alexandre Julliard (1):
29013 http-fetch: Disable use of curl multi support for libcurl < 7.16.
29015 Amos Waterland (1):
29016 wcwidth redeclaration
29018 Arjen Laarhoven (1):
29019 Document 'opendiff' value in config.txt and git-mergetool.txt
29022 Allow PERL_PATH="/usr/bin/env perl"
29023 posix compatibility for t4200
29026 Mention version 1.5.1 in tutorial and user-manual
29028 Daniel Barkalow (1):
29029 Make xstrndup common
29031 Frank Lichtenheld (1):
29032 cvsserver: Handle re-added files correctly
29034 J. Bruce Fields (7):
29035 user-manual: more discussion of detached heads, fix typos
29036 user-manual: add section ID's
29037 user-manual: clean up fast-forward and dangling-objects sections
29038 user-manual: fix .gitconfig editing examples
29039 user-manual: miscellaneous editing
29040 user-manual: stop deprecating the manual
29041 user-manual: fix clone and fetch typos
29043 Jakub Narębski (1):
29044 diff format documentation: describe raw combined diff format
29047 Documentation: fix typo in git-remote.txt
29050 Documentation: don't reference non-existent 'git-cvsapplycommit'
29052 Johannes Schindelin (1):
29053 Teach import-tars about GNU tar's @LongLink extension.
29055 Junio C Hamano (5):
29056 diff.c: fix "size cache" handling.
29057 blame: Notice a wholesale incorporation of an existing file.
29059 Add test for blame corner cases.
29062 Karl Hasselström (2):
29063 Fix markup in git-svn man page
29064 Add --no-rebase option to git-svn dcommit
29066 Linus Torvalds (1):
29067 Fix --boundary output
29069 Martin Koegler (1):
29070 Fix compilation of test-delta
29072 Paul Mackerras (1):
29073 gitk: Allow user to choose whether to see the diff, old file, or new file
29076 Add howto files to rpm packages.
29078 Shawn O. Pearce (1):
29079 git-gui: Allow spaces in path to 'wish'
29082 gitweb: use decode_utf8 directly
29085 Version v1.5.1.3; changes since v1.5.1.2:
29086 -----------------------------------------
29089 Remove usernames from all commit messages, not just when using svmprops
29090 git-svn: Don't rely on $_ after making a function call
29091 git-svn: Ignore usernames in URLs in find_by_url
29092 git-svn: Added 'find-rev' command
29093 git-svn: Add 'find-rev' command
29096 Fix handle leak in write_tree
29099 Removing -n option from git-diff-files documentation
29100 Document additional options for git-fetch
29101 Update git-fmt-merge documentation
29102 Update git-grep documentation
29103 Update -L documentation for git-blame/git-annotate
29104 Update git-http-push documentation
29105 Update git-local-fetch documentation
29106 Update git-http-fetch documentation
29108 Brian Gernhardt (2):
29109 Reverse the order of -b and --track in the man page.
29110 Ignore all man sections as they are generated files.
29113 Documentation/git-reset.txt: suggest git commit --amend in example.
29116 Clarify SubmittingPatches Checklist
29117 git.7: Mention preformatted html doc location
29118 send-email documentation: clarify --smtp-server
29120 Johannes Schindelin (2):
29121 dir.c(common_prefix): Fix two bugs
29122 import-tars: be nice to wrong directory modes
29125 Fix typo in git-am: s/Was is/Was it/
29126 Create a sysconfdir variable, and use it for ETC_GITCONFIG
29127 Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
29129 Julian Phillips (1):
29130 http.c: Fix problem with repeated calls of http_init
29132 Junio C Hamano (8):
29133 Build RPM with ETC_GITCONFIG=/etc/gitconfig
29134 applymbox & quiltimport: typofix.
29135 Start preparing for 1.5.1.3
29136 Do not barf on too long action description
29137 Update .mailmap with "Michael"
29138 Fix import-tars fix.
29139 Fix symlink handling in git-svn, related to PerlIO
29142 Michele Ballabio (1):
29143 git shortlog documentation: add long options and fix a typo
29145 Robin H. Johnson (10):
29146 Document --dry-run parameter to send-email.
29147 Prefix Dry- to the message status to denote dry-runs.
29148 Debugging cleanup improvements
29149 Change the scope of the $cc variable as it is not needed outside of send_message.
29150 Perform correct quoting of recipient names.
29151 Validate @recipients before using it for sendmail and Net::SMTP.
29152 Ensure clean addresses are always used with Net::SMTP
29153 Allow users to optionally specify their envelope sender.
29154 Document --dry-run and envelope-sender for git-send-email.
29155 Sanitize @to recipients.
29157 Shawn O. Pearce (3):
29158 Actually handle some-low memory conditions
29159 Don't allow empty pathnames in fast-import
29160 Catch empty pathnames in trees during fsck
29163 Version v1.5.1.2; changes since v1.5.1.1:
29164 -----------------------------------------
29167 Use rev-list --reverse in git-rebase.sh
29168 Document -g (--walk-reflogs) option of git-log
29169 Fix overwriting of files when applying contextually independent diffs
29172 Update git-am documentation
29173 Update git-applymbox documentation
29174 Update git-apply documentation
29175 Update git-annotate/git-blame documentation
29176 Update git-archive documentation
29177 Update git-cherry-pick documentation
29178 Fix unmatched emphasis tag in git-tutorial
29179 Update git-config documentation
29181 Andy Whitcroft (1):
29182 fix up strtoul_ui error handling
29185 Use const qualifier for 'sha1' parameter in delete_ref function
29188 git-svn: respect lower bound of -r/--revision when following parent
29189 git-svn: quiet some warnings when run only with --version/--help
29190 git-svn: don't allow globs to match regular files
29191 perl: install private Error.pm if the site version is older than our own
29193 Eygene Ryabinkin (2):
29194 Teach gitk to use the user-defined UI font everywhere.
29195 Improve look-and-feel of the gitk tool.
29197 Frank Lichtenheld (5):
29198 config.txt: Document gitcvs.allbinary
29199 config.txt: Document core.autocrlf
29200 config.txt: Change pserver to server in description of gitcvs.*
29201 config.txt: Fix grammatical error in description of http.noEPSV
29202 git-shortlog: Fix two formatting errors in asciidoc documentation
29205 variable $projectdesc needs to be set before checking against unchanged default.
29206 Have sample update hook not refuse deleting a branch through push.
29208 J. Bruce Fields (7):
29209 Documentation: minor edits of git-lost-found manpage
29210 Documentation: clarify git-checkout -f, minor editing
29211 Documentation: clarify track/no-track option.
29212 user-manual: fix discussion of default clone
29213 user-manual: detached HEAD
29214 user-manual: start revising "internals" chapter
29215 user-manual: use detached head when rewriting history
29218 sscanf/strtoul: parse integers robustly
29220 Junio C Hamano (4):
29221 Do not default to --no-index when given two directories.
29222 Start preparing for 1.5.1.2
29223 git-clone: fix dumb protocol transport to clone from pack-pruned ref
29226 Linus Torvalds (1):
29227 git-quiltimport complaining yet still working
29229 Matthias Lederhofer (1):
29230 handle_options in git wrapper miscounts the options it handled.
29233 git-blame: Fix overrun in fake_working_tree_commit()
29236 git-tar-tree: complete deprecation conversion message
29238 Shawn O. Pearce (1):
29239 git-gui: Brown paper bag fix division by 0 in blame
29242 Version v1.5.1.1; changes since v1.5.1:
29243 ---------------------------------------
29245 Arjen Laarhoven (4):
29246 usermanual.txt: some capitalization nits
29247 t3200-branch.sh: small language nit
29248 t5300-pack-object.sh: portability issue using /usr/bin/stat
29249 Makefile: iconv() on Darwin has the old interface
29251 Brian Gernhardt (3):
29252 Fix t4200-rerere for white-space from "wc -l"
29253 Document --left-right option to rev-list.
29254 Distinguish branches by more than case in tests.
29257 Fix lseek(2) calls with args 2 and 3 swapped
29260 git-svn: bail out on incorrect command-line options
29261 git-svn: dcommit/rebase confused by patches with git-svn-id: lines
29262 git-svn: fix log command to avoid infinite loop on long commit messages
29264 Frank Lichtenheld (7):
29265 cvsimport: sync usage lines with existing options
29266 cvsimport: Improve documentation of CVSROOT and CVS module determination
29267 cvsimport: Improve usage error reporting
29268 cvsimport: Reorder options in documentation for better understanding
29269 cvsimport: Improve formating consistency
29270 cvsserver: small corrections to asciidoc documentation
29271 cvsserver: Fix handling of diappeared files on update
29274 Fix renaming branch without config file
29277 rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.
29279 Jakub Narębski (1):
29280 gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches
29283 (encode_85, decode_85): Mark source buffer pointer as "const".
29285 Julian Phillips (1):
29286 Documentation: show-ref: document --exclude-existing
29288 Junio C Hamano (7):
29289 rerere: make sorting really stable.
29290 Fix dependency of common-cmds.h
29291 Documentation: tighten dependency for git.{html,txt}
29292 Prepare for 1.5.1.1
29293 Add Documentation/cmd-list.made to .gitignore
29294 fsck: do not complain on detached HEAD.
29298 rename_ref(): only print a warning when config-file update fails
29299 Make builtin-branch.c handle the git config file
29302 Revert "builtin-archive: use RUN_SETUP"
29304 Shawn O. Pearce (1):
29305 Honor -p<n> when applying git diffs
29307 Tomash Brechko (1):
29308 cvsexportcommit -p : fix the usage of git-apply -C.
29311 DESTDIR support for git/contrib/emacs
29313 YOSHIFUJI Hideaki (1):
29314 Avoid composing too long "References" header.
29317 Version v1.5.1; changes since v1.5.1-rc3:
29318 -----------------------------------------
29321 Keep rename/rename conflicts of intermediate merges while doing recursive merge
29324 Reimplement emailing part of hooks--update in contrib/hooks/post-receive-email
29326 Christian Couder (1):
29327 Bisect: Improve error message in "bisect_next_check".
29330 git-mailinfo fixes for patch munging
29333 git-svn: avoid respewing similar error messages for missing paths
29334 git-svn: fail on rebase if we are unable to find a ref to rebase against
29337 git-quiltimport /bin/sh-ism fix
29339 Frank Lichtenheld (1):
29340 cvsserver: Don't lie about binary mode in asciidoc documentation
29343 Documentation/git-svnimport.txt: fix typo.
29344 Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
29346 H. Peter Anvin (1):
29347 git-upload-pack: make sure we close unused pipe ends
29349 Jakub Narębski (2):
29350 gitweb: Support comparing blobs (files) with different names
29351 Documentation: A few minor fixes to Git User's Manual
29353 Julian Phillips (1):
29354 contrib/workdir: add a simple script to create a working directory
29356 Junio C Hamano (6):
29357 Update draft release notes for 1.5.1
29358 Do not bother documenting fetch--tool
29359 Hopefully final update to the draft Release Notes, preparing for 1.5.1
29360 rerere should not repeat the earlier hunks in later ones
29365 Plug memory leak in index-pack collision checking codepath.
29367 Theodore Ts'o (12):
29368 Fix minor formatting issue in man page for git-mergetool
29369 mergetool: Replace use of "echo -n" with printf(1) to be more portable
29370 mergetool: Don't error out in the merge case where the local file is deleted
29371 mergetool: portability fix: don't assume true is in /bin
29372 mergetool: portability fix: don't use reserved word function
29373 mergetool: factor out common code
29374 mergetool: Remove spurious error message if merge.tool config option not set
29375 mergetool: Fix abort command when resolving symlinks and deleted files
29376 mergetool: Add support for Apple Mac OS X's opendiff command
29377 mergetool: Make git-rm quiet when resolving a deleted file conflict
29378 mergetool: Clean up description of files and prompts for merge resolutions
29379 Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS
29382 Version v1.5.1-rc3; changes since v1.5.1-rc2:
29383 ---------------------------------------------
29385 Alexandre Julliard (1):
29386 git.el: Display some information about the HEAD commit.
29388 Christian Couder (2):
29389 Bisect: Use "git-show-ref --verify" when reseting.
29390 Bisect: add checks at the beginning of "git bisect run".
29393 Makefile: remove test-chmtime program in target clean.
29394 http-fetch: don't use double-slash as directory separator in URLs
29395 http-fetch: remove path_len from struct alt_base, it was computed but never used
29397 H. Peter Anvin (1):
29398 git-upload-pack: make sure we close unused pipe ends
29400 Jakub Narębski (2):
29401 gitweb: Add example of config file and how to generate projects list to gitweb/INSTALL
29402 gitweb: Cleanup and uniquify die_error calls
29405 read-tree: use xcalloc
29406 use xrealloc in help.c
29409 git-rm: don't remove newly added file without -f
29410 --pretty=format: fix broken %ct and %at interpolation
29411 Add some basic tests of rev-list --pretty=format
29412 Fix "--pretty=format:" encoding item
29413 t/t6006: add tests for a slightly more complex commit messages
29414 commit: fix pretty-printing of messages with "\nencoding "
29417 sha1_file.c (write_sha1_from_fd): Detect close failure.
29419 Johannes Schindelin (1):
29420 t4118: be nice to non-GNU sed
29422 Junio C Hamano (7):
29423 Document git-log --first-parent
29424 sha1_file.c (write_sha1_file): Detect close failure
29425 git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
29426 Fix "--pretty=format:" for parent related items.
29428 Update main git.html page to point at 1.5.0.6 documentation
29431 Linus Torvalds (1):
29432 Fix "getaddrinfo()" buglet
29435 Version v1.5.1-rc2; changes since v1.5.1-rc1:
29436 ---------------------------------------------
29439 Document --quiet option to git-diff
29440 Use diff* with --exit-code in git-am, git-rebase and git-merge-ours
29443 update-hook: abort early if the project description is unset
29444 update-hook: remove e-mail sending hook.
29447 prefer "git COMMAND" over "git-COMMAND" in gitk
29450 make git clone -q suppress the noise with http fetch
29452 Christian Couder (6):
29453 Bisect: implement "git bisect run <cmd>..." to automatically bisect.
29454 Documentation: bisect: reformat some paragraphs.
29455 Documentation: bisect: reword one paragraph.
29456 Documentation: bisect: reformat more paragraphs.
29457 Documentation: bisect: add some titles to some paragraphs.
29458 Documentation: bisect: make a comment fit better in the man page.
29461 gitk: bind <F5> key to Update (reread commits)
29462 git-svn: fix rel_path() when not connected to the repository root
29464 J. Bruce Fields (5):
29465 user-manual: run xsltproc without --nonet option
29466 user-manual: Use def_ instead of ref_ for glossary references.
29467 glossary: stop generating automatically
29468 glossary: clean up cross-references
29469 user-manual: introduce "branch" and "branch head" differently
29471 Jakub Narębski (4):
29472 gitweb: Fix "next" link in commit view
29473 gitweb: Don't escape attributes in CGI.pm HTML methods
29474 gitweb: Fix not marking signoff lines in "log" view
29475 gitweb: Add some installation notes in gitweb/INSTALL
29478 Replace remaining instances of strdup with xstrdup.
29479 use xmalloc in git.c and help.c
29482 user-manual.txt: fix a tiny typo.
29484 Johannes Schindelin (5):
29485 xdiff/xutils.c(xdl_hash_record): factor out whitespace handling
29486 Add a HOWTO for setting up a standalone git daemon
29487 Provide some technical documentation for shallow clones
29488 t4118: be nice to non-GNU sed
29489 git-revert: Revert revert message to old behaviour
29492 Teach git-remote to list pushed branches.
29494 Junio C Hamano (15):
29495 git-log --first-parent: show only the first parent log
29496 blame: micro-optimize cmp_suspect()
29497 blame: cmp_suspect is not "cmp" anymore.
29498 Teach tree_entry_interesting() that the tree entries are sorted.
29499 tree-diff: avoid strncmp()
29500 tree_entry_interesting(): allow it to say "everything is interesting"
29501 git-rebase: make 'rebase HEAD branch' work as expected.
29502 git-apply: Do not free the wrong buffer when we convert the data for writeout
29503 checkout: report where the new HEAD is upon detaching HEAD
29504 git-bisect: typofix
29505 git-bisect.sh: properly dq $GIT_DIR
29506 Fix path-limited "rev-list --bisect" termination condition.
29507 git-am documentation: describe what is taken from where.
29508 Update README to point at a few key periodical messages to the list
29512 gitweb: Change to use explicitly function call cgi->escapHTML()
29514 Linus Torvalds (6):
29515 Fix loose object uncompression check.
29516 Don't ever return corrupt objects from "parse_object()"
29517 Be more careful about zlib return values
29518 Remove "pathlen" from "struct name_entry"
29519 Initialize tree descriptors with a helper function rather than by hand.
29520 Switch over tree descriptors to contain a pre-parsed entry
29522 Michael S. Tsirkin (2):
29523 fix typo in git-am manpage
29524 git-merge: Put FETCH_HEAD data in merge commit message
29526 Nicolas Pitre (10):
29527 clean up the delta base cache size a bit
29528 use a LRU eviction policy for the delta base cache
29529 don't ever allow SHA1 collisions to exist by fetching a pack
29530 index-pack: use hash_sha1_file()
29531 index-pack: more validation checks and cleanups
29532 improve checkout message when asking for same branch
29533 minor git-prune optimization
29534 update HEAD reflog when branch pointed to by HEAD is directly modified
29535 make it more obvious that temporary files are temporary files
29536 write_sha1_from_fd() should make new objects read-only
29539 Documentation/pack-format.txt: Clear up description of types.
29542 git-fetch: Fix single_force in append_fetch_head
29544 Shawn O. Pearce (1):
29545 contrib/continuous: a continuous integration build manager
29547 Uwe Kleine-König (1):
29548 Bisect: convert revs given to good and bad to commits
29551 Version v1.5.1-rc1; changes since v1.5.0.7:
29552 -------------------------------------------
29555 disable t4016-diff-quote.sh on some filesystems
29556 git-gui: Support of "make -s" in: do not output anything of the build itself
29557 More build output cleaning up
29558 Support of "make -s": do not output anything of the build itself
29559 Allow "make -w" generate its usual output
29560 Allow git-diff exit with codes similar to diff(1)
29561 Add tests for --quiet option of diff programs
29563 Alexandre Julliard (1):
29564 git.el: Add support for commit hooks.
29567 Only show log entries for new revisions in hooks--update
29568 Have git-cvsserver call hooks/update before really altering the ref
29569 The "table-of-contents" in the update hook script should match the body
29570 cvsserver: Remove trailing "\n" from commithash in checkin function
29571 cvsserver: Make always-binary mode a config file option
29572 Sample update hook: typofix and modernization to use "git log"
29573 update-hook: fix incorrect use of git-describe and sed for finding previous tag
29575 Aneesh Kumar K.V (1):
29576 Documentation: document remote.<name>.tagopt
29579 git-send-email: configurable bcc and chain-reply-to
29582 builtin-mailinfo.c infrastrcture changes
29583 restrict the patch filtering
29584 Add a couple more test cases to the suite.
29587 git-svn: move authentication prompts into their own namespace
29588 git-svn: cleanup: move process_rm around
29589 git-svn: cleanup: put SVN workarounds into their own namespace
29590 git-svn: cleanup: avoid re-use()ing Git.pm in sub-packages
29591 git-svn: add Git::SVN module (to avoid global variables)
29592 git-svn: convert 'init' to use Git::SVN
29593 git-svn: convert multi-init over to using Git::SVN
29594 git-svn: make multi-init capable of reusing the Ra connection
29595 git-svn: add a test for show-ignore
29596 git-svn: convert show-ignore over to Git::SVN
29597 git-svn: moved the 'log' command into its own namespace
29598 git-svn: port the 'rebuild' command to use Git::SVN objects
29599 git-svn: do not let Git.pm warn if we prematurely close pipes
29600 git-svn: convert the 'commit-diff' command to Git::SVN
29601 git-svn: get rid of Memoize for now...
29602 git-svn: fetch/multi-fetch converted over to Git::SVN module
29603 git-svn: switch dcommit to using Git::SVN code
29604 git-svn: convert 'set-tree' command to use Git::SVN
29605 git-svn: remove graft-branches command
29606 git-svn: add support for metadata in .git/config
29607 git-svn: fix a regression in dcommit that caused empty log messages
29608 git-svn: reuse open SVN::Ra connections by URL
29609 git-svn: enable --minimize to simplify the config and connections
29610 git-svn: fix --follow-parent to work with Git::SVN
29611 git-svn: --follow-parent works with svn-remotes multiple branches
29612 git-svn: disallow ambigious local refspecs
29613 git-svn: allow --follow-parent on deleted directories
29614 git-svn: get rid of additional fetch-arguments
29615 git-svn: allow 'init' to work outside of tests
29616 git-svn: better error reporting if --follow-parent fails
29617 git-svn: 'init' attempts to connect to the repository root if possible
29618 git-svn: --follow-parent now works on sub-directories of larger branches
29619 git-svn: track writes writes to the index in fetch
29620 git-svn: add an odd test case that seems to cause segfaults over HTTP
29621 git-svn: avoid tracking change-less revisions
29622 git-svn: correctly track revisions made to deleted branches
29623 git-svn: fix segfaults from accessing svn_log_changed_path_t
29624 git-svn: fix committing to subdirectories, add tests
29625 git-svn: avoid an extra svn_ra connection during commits
29626 git-svn: simplify usage of the SVN::Git::Editor interface
29627 git-svn: cleanup remove unused function
29628 git-svn: allow multi-fetch to fetch things chronologically
29629 git-svn: correctly track diff-less copies with do_switch
29630 git-svn: correctly handle do_{switch,update} in deep directories
29631 git-svn: stop using path names as refnames with --follow-parent
29632 git-svn: cleanup: move editor-specific variables into the editor namespace
29633 git-svn: just use Digest::MD5 instead of requiring it
29634 git-svn: reinstate the default SVN error handler after using get_log
29635 git-svn: don't rely on do_switch + reparenting with svn(+ssh)://
29636 git-svn: fetch tracks initial change with --follow-parent
29637 git-svn: remove the 'rebuild' command and make the functionality automatic
29638 git-svn: fix several fetch bugs related to repeated invocations
29639 git-svn: reinstate --no-metadata, add --svn-remote=, variable cleanups
29640 git-svn: gracefully handle --follow-parent failures
29641 git-svn: make (multi-)fetch safer but slower
29642 git-svn: avoid a huge memory spike with high-numbered revisions
29643 git-svn: re-enable repacking flags
29644 git-svn: do our best to ensure that our ref and rev_db are consistent
29645 git-svn: avoid redundant get_log calls between invocations
29646 git-svn: use sys* IO functions for reading rev_db
29647 git-svn: don't write to the config file from --follow-parent
29648 git-svn: save paths to tags/branches with for future reuse
29649 git-svn: migrations default to [svn-remote "git-svn"]
29650 git-svn: get rid of revisions_eq check for --follow-parent
29651 git-svn: avoid extra get_log calls when refspecs are added for fetching
29652 git-svn: just name the default svn-remote "svn" instead of "git-svn"
29653 git-svn: prepare multi-init for wildcard support
29654 git-svn: reintroduce using a single get_log() to fetch
29655 git-svn: run get_log() on a sub-directory if possible
29656 git-svn: implement auto-discovery of branches/tags
29657 git-svn: --follow-parent tracks multi-parent paths
29658 git-svn: remove check_path calls before calling do_update
29659 git-svn: remove some noisy debugging messages
29660 git-svn: enable follow-parent functionality by default
29661 git-svn: fix buggy regular expression usage in several places
29662 git-svn: correctly handle the -q flag in SVN::Git::Fetcher
29663 git-svn: correctly handle globs with a right-hand-side path component
29664 git-svn: remove optimized commit stuff for set-tree
29665 git-svn: add support for SVN::Mirror/svk using revprops for metadata
29666 git-svn: add support for per-[svn-remote "..."] options
29667 git-svn: use private $GIT_DIR/svn/config file more
29668 git-svn: extra safety for noMetadata and useSvmProps users
29669 git-svn: use separate, per-repository .rev_db files
29670 git-svn: write the highest maxRex out for branches and tags
29671 git-svn: handle multi-init without --trunk, UseSvmProps fixes
29672 git-svn: make dcommit usable for glob users
29673 git-svn: include merges when calling rev-list for decommit
29674 git-svn: usability fixes for the 'git svn log' command
29675 t910*: s/repo-config/config/g; poke around possible race conditions
29676 git-svn: hopefully make 'fetch' more user-friendly
29677 git-svn: allow 'init' to act as multi-init
29678 git-svn: brown paper bag fixes
29679 git-svn: simplify the (multi-)init methods of fetching
29680 git-svn: allow --log-window-size to be specified, default to 100
29681 git-svn: remember to check for clean indices on globbed refs, too
29682 git-svn: error checking for invalid [svn-remote "..."] sections
29683 git-svn: allow dcommit for those who only fetch from SVM with useSvmProps
29684 git-svn: documentation updates for new functionality
29685 git-svn: add support for --stat in the log command
29686 git-svn: checkout files on new fetches
29687 git-svn: add a 'rebase' command
29688 git-svn: fix some issues for people migrating from older versions
29689 git-svn: hide the private git-svn 'config' file as '.metadata'
29690 git-svn: add 'clone' command, an alias for init + fetch
29691 git-svn: allow overriding of the SVN repo root in metadata
29692 git-svn: add support for using svnsync properties
29693 git-svn: fix useSvmProps, hopefully for the last time
29694 git-svn: add test for useSvnsyncProps
29695 git-svn: documentation updates
29696 git-svn: allow metadata options to be specified with 'init' and 'clone'
29697 git-svn: give show-ignore HEAD smarts, like dcommit and log
29698 git-svn: ensure we're at the top-level and can access $GIT_DIR
29699 git-svn: fix clone when a target directory has been specified
29700 git-svn: fix reconnections to different paths of svn:// repositories
29701 git-svn: fix some potential bugs with --follow-parent
29702 Add test-chmtime: a utility to change mtime on files
29703 Update tests to use test-chmtime
29704 git-svn: fix show-ignore when not connected to the repository root
29705 git-svn: add -l/--local command to "git svn rebase"
29707 Frank Lichtenheld (3):
29708 cvsserver: Use Merged response instead of Update-existing for merged files
29709 cvsserver: Be more chatty
29710 cvsserver: further improve messages on commit and status
29712 Fredrik Kuivinen (1):
29713 New autoconf test for iconv
29715 J. Bruce Fields (1):
29716 Make git-send-email aware of Cc: lines.
29718 Jakub Narębski (1):
29719 gitweb: Don't escape attributes in CGI.pm HTML methods
29722 add: Support specifying an excludes file with a configuration variable
29724 mergetool: Add support for vimdiff.
29727 New fast-import test case for valid tree sorting
29730 I like the idea of the new ':/<oneline prefix>' notation, and gave it a try, but all I could get was a segfault. It was dereferencing a NULL commit list. Fix below. With it, this example now works:
29731 git-grep: don't use sscanf
29733 Johannes Schindelin (42):
29734 Teach revision machinery about --reverse
29735 teach diff machinery about --ignore-space-at-eol
29736 name-rev: introduce the --refs=<pattern> option
29737 diff --check: use colour
29738 apply: fix memory leak in prefix_one()
29739 name-rev: avoid "^0" when unneeded
29740 rev-list --max-age, --max-count: support --boundary
29741 fetch & clone: do not output progress when not on a tty
29742 config: read system-wide defaults from /etc/gitconfig
29743 git grep: use pager
29744 Teach diff -B about colours
29745 apply: make --verbose a little more useful
29746 Teach git-diff-files the new option `--no-index`
29747 pretty-formats: add 'format:<string>'
29748 Make tests independent of global config files
29749 Add git-bundle: move objects and references by archive
29750 git-bundle: assorted fixes
29751 git-bundle: avoid fork() in verify_bundle()
29752 git-bundle: fix 'create --all'
29753 git-bundle: record commit summary in the prerequisite data
29754 Fixup no-progress for fetch & clone
29755 object name: introduce ':/<oneline prefix>' notation
29756 Fix typo: do not show name1 when name2 fails
29757 diff --no-index: also imitate the exit status of diff(1)
29758 Actually make print_wrapped_text() useful
29759 show_date(): rename the "relative" parameter to "mode"
29760 diff: make more cases implicit --no-index
29761 print_wrapped_text: fix output for negative indent
29762 Make git-revert & git-cherry-pick a builtin
29763 diff: support reading a file from stdin via "-"
29764 diff --no-index: support /dev/null as filename
29765 Get rid of the dependency to GNU diff in the tests
29766 cherry-pick: Suggest a better method to retain authorship
29767 format-patch: add --inline option and make --attach a true attachment
29768 bundle: fix wrong check of read_header()'s return value & add tests
29769 git-bundle: avoid packing objects which are in the prerequisites
29770 git-bundle: Make thin packs
29771 git-bundle: handle thin packs in subcommand "unbundle"
29772 git-bundle: die if a given ref is not included in bundle
29773 git-bundle: prevent overwriting existing bundles
29774 git-bundle: only die if pack would be empty, warn if ref is skipped
29775 Do not output "GEN " when generating perl.mak
29778 Add core.symlinks to mark filesystems that do not support symbolic links.
29779 Handle core.symlinks=false case in merge-recursive.
29780 Tell multi-parent diff about core.symlinks.
29782 Julian Phillips (5):
29783 Allow fetch--tool to read from stdin
29784 Use stdin reflist passing in parse-remote
29785 Use stdin reflist passing in git-fetch.sh
29786 git-branch: improve abbreviation of sha1s in verbose mode
29787 git-branch: document new --no-abbrev option
29789 Junio C Hamano (80):
29790 git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)
29791 Make merge-base a built-in.
29792 Allow in_merge_bases() to take more than one reference commits.
29793 Remove git-resolve.
29794 Remove git-diff-stages.
29795 Add link to v1.5.0 documentation.
29796 blame: --show-stats for easier optimization work.
29797 git-fetch: split fetch_main into fetch_dumb and fetch_native
29798 git-fetch--tool: start rewriting parts of git-fetch in C.
29799 git-fetch: move more code into C.
29800 git-fetch: rewrite another shell loop in C
29801 git-fetch: rewrite expand_ref_wildcard in C
29802 Document --ignore-space-at-eol option.
29804 Point top-level RelNotes link at 1.5.1 release notes being prepared.
29805 t0020: add test for auto-crlf
29806 remotes.not-origin.tagopt
29807 Teach 'git apply' to look at $GIT_DIR/config
29808 Teach core.autocrlf to 'git apply'
29809 Update draft release notes for 1.5.1
29810 Teach 'git apply' to look at $HOME/.gitconfig even outside of a repository
29811 git-apply: do not lose cwd when run from a subdirectory.
29812 git-apply: require -p<n> when working in a subdirectory.
29813 Link 1.5.0.1 documentation from the main page.
29815 Mechanical conversion to use prefixcmp()
29816 prefixcmp(): fix-up mechanical conversion.
29817 prefixcmp(): fix-up leftover strncmp().
29818 t4119: add test for traditional patch and different p_value
29819 Fix botched "leak fix"
29820 git-apply: notice "diff --git" patch again
29821 git-apply: guess correct -p<n> value for non-git patches.
29822 t4119: test autocomputing -p<n> for traditional diff input.
29823 git-status: do not be totally useless in a read-only repository.
29824 update-index: do not die too early in a read-only repository.
29825 run_diff_{files,index}(): update calling convention.
29826 .mailmap maintenance after pulling from git-svn
29827 bundle: reword missing prerequisite error message
29828 git-fetch--tool takes flags before the subcommand.
29829 diff --cached: give more sensible error message when HEAD is yet to be created.
29830 Documentation: link in 1.5.0.2 material to the top documentation page.
29831 builtin-fetch--tool: adjust to updated sha1_object_info().
29832 Make 'cvs ci' lockless in git-cvsserver by using git-update-ref
29833 fetch--tool: fix uninitialized buffer when reading from stdin
29834 builtin-fetch--tool: make sure not to overstep ls-remote-result buffer.
29835 index_fd(): use enum object_type instead of type name string.
29836 index_fd(): pass optional path parameter as hint for blob conversion
29837 index_fd(): convert blob only if it is a regular file.
29838 Add recent changes to draft 1.5.1 release notes.
29839 git-fetch: retire update-local-ref which is not used anymore.
29840 builtin-fetch--tool: fix reflog notes.
29841 diff-ni: allow running from a subdirectory.
29842 diff-ni: fix the diff with standard input
29843 .gitignore: add git-fetch--tool
29844 format-patch --attach: not folding some long headers.
29845 Post 1.5.0.3 cleanup
29846 fsck: fix broken loose object check.
29847 unpack_sha1_file(): detect corrupt loose object files.
29848 fsck: exit with non-zero status upon errors
29849 git-bundle: fix pack generation.
29850 revision walker: Fix --boundary when limited
29851 revision traversal: retire BOUNDARY_SHOW
29852 git-bundle: various fixups
29853 revision traversal: SHOWN means shown
29854 git-bundle: make verify a bit more chatty.
29855 revision --boundary: fix stupid typo
29856 revision --boundary: fix uncounted case.
29857 Fix broken create_branch() in builtin-branch.
29858 prepare_packed_git(): sort packs by age and localness.
29859 Documentation: add git-mergetool to the command list.
29860 shortlog: prompt when reading from terminal by mistake
29861 Remove unused diffcore_std_no_resolve
29863 Teach --quiet to diff backends.
29864 revision.c: explain what tree_difference does
29865 try-to-simplify-commit: use diff-tree --quiet machinery.
29866 applymbox: brown paper bag fix.
29867 Update main git.html page to point at 1.5.0.5 documentation
29872 gitweb: Change to use explicitly function call cgi->escapHTML()
29874 Linus Torvalds (8):
29875 Lazy man's auto-CRLF
29876 Make AutoCRLF ternary variable.
29877 Re-fix get_sha1_oneline()
29878 Make trivial wrapper functions around delta base generation and freeing
29879 Implement a simple delta_base cache
29880 Avoid unnecessary strlen() calls
29881 Trivial cleanup of track_tree_refs()
29882 Set up for better tree diff optimizations
29885 Support for large files on 32bit systems.
29887 Michael Coleman (2):
29888 git-send-email: abort/usage on bad option
29889 fix various doc typos
29891 Nicolas Pitre (12):
29892 sha1_file.c: cleanup hdr usage
29893 sha1_file.c: cleanup "offset" usage
29894 sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
29895 formalize typename(), and add its reverse type_from_string()
29896 convert object type handling from a string to a number
29897 get rid of lookup_object_type()
29898 make sure enum object_type is signed
29899 local-fetch.c: some error printing cleanup
29900 fix t5300-pack-object.sh
29901 add test for OFS_DELTA objects
29902 clean up pack index handling a bit
29903 Reuse cached data out of delta base cache.
29906 git-config: document --rename-section, provide --remove-section
29907 git-archimport: allow remapping branch names
29908 git-commit: add a --interactive option
29909 git-branch, git-checkout: autosetup for remote branch tracking
29910 git-fetch, git-branch: Support local --track via a special remote '.'
29913 git-remote: support remotes with a dot in the name
29916 git-svn: make test for SVK mirror path import
29917 git-svn: don't consider SVN URL usernames significant when comparing
29918 git-svn: document --username
29921 t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch
29922 t/t5515-fetch-merge-logic.sh: Add two more tests
29925 Documentation/git-svn.txt: Fix formatting errors
29927 Shawn O. Pearce (43):
29928 Cleanup check_valid in commit-tree.
29929 cherry-pick: Bug fix 'cherry picked from' message.
29930 Make 'make' quieter while building git
29931 Make 'make' quiet by default
29932 Display the null SHA-1 as the base for an OBJ_OFS_DELTA.
29933 Fix mmap leak caused by reading bad indexes.
29934 Don't build external_grep if its not used
29935 General const correctness fixes
29936 Use uint32_t for all packed object counts.
29937 Use uint32_t for pack-objects counters.
29938 Use off_t when we really mean a file offset.
29939 Use off_t in pack-objects/fast-import when we mean an offset
29940 Cast 64 bit off_t to 32 bit size_t
29941 Preallocate memory earlier in fast-import
29942 Move post-update hook to after all other activity
29943 Don't run post-update hook unless a ref changed
29944 Refactor run_update_hook to be more useful
29945 Refactor handling of error_string in receive-pack
29946 Teach receive-pack to run pre-receive/post-receive hooks
29947 Use atomic updates to the fast-import mark file
29948 Allow fast-import frontends to reload the marks table
29949 Switch to run_command_v_opt in revert
29950 Remove unused run_command variants
29951 Start defining a more sophisticated run_command
29952 Split run_command into two halves (start/finish)
29953 Teach run_command how to setup a stdin pipe
29954 Refactor run_command error handling in receive-pack
29955 Split back out update_hook handling in receive-pack
29956 Change {pre,post}-receive hooks to use stdin
29957 Remove unnecessary casts from fast-import
29958 Simplify closing two fds at once in run-command.c
29959 Fix t5510-fetch's use of sed
29960 Teach run-command about stdout redirection
29961 Teach run-command to redirect stdout to /dev/null
29962 Replace fork_with_pipe in bundle with run_command
29963 Correct new compiler warnings in builtin-revert
29964 Use RUN_GIT_CMD to run push backends
29965 Use run_command for proxy connections
29966 Use run_command within merge-index
29967 Use run_command within receive-pack to invoke index-pack
29968 Use run_command within send-pack
29970 Limit the size of the new delta_base_cache
29972 Simon 'corecode' Schubert (1):
29973 Allow passing of an alternative CVSROOT via -d.
29976 Teach git-remote to update existing remotes by fetching from them
29977 Add config_boolean() method to the Git perl module
29978 Allow git-remote to update named groups of remotes
29979 Add git-mergetool to run an appropriate merge conflict resolution program
29980 mergetool: print an appropriate warning if merge.tool is unknown
29982 Xavier Maillard (1):
29983 contrib/emacs: Use non-interactive function to byte-compile files
29986 Version v1.5.0.7; changes since v1.5.0.6:
29987 -----------------------------------------
29990 Documentation/git-svnimport.txt: fix typo.
29991 Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
29993 H. Peter Anvin (1):
29994 git-upload-pack: make sure we close unused pipe ends
29996 Junio C Hamano (2):
29997 rerere should not repeat the earlier hunks in later ones
30001 Version v1.5.0.6; changes since v1.5.0.5:
30002 -----------------------------------------
30004 J. Bruce Fields (5):
30005 user-manual: run xsltproc without --nonet option
30006 user-manual: Use def_ instead of ref_ for glossary references.
30007 glossary: stop generating automatically
30008 glossary: clean up cross-references
30009 user-manual: introduce "branch" and "branch head" differently
30011 Jakub Narębski (4):
30012 gitweb: Fix "next" link in commit view
30013 gitweb: Don't escape attributes in CGI.pm HTML methods
30014 gitweb: Fix not marking signoff lines in "log" view
30015 gitweb: Add some installation notes in gitweb/INSTALL
30018 commit: fix pretty-printing of messages with "\nencoding "
30021 user-manual.txt: fix a tiny typo.
30023 Johannes Schindelin (1):
30024 t4118: be nice to non-GNU sed
30026 Junio C Hamano (2):
30027 git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
30031 gitweb: Change to use explicitly function call cgi->escapHTML()
30033 Michael S. Tsirkin (1):
30034 fix typo in git-am manpage
30037 Documentation/pack-format.txt: Clear up description of types.
30040 Version v1.5.0.5; changes since v1.5.0.4:
30041 -----------------------------------------
30043 Junio C Hamano (1):
30047 git-merge: finish when git-read-tree fails
30050 Version v1.5.0.4; changes since v1.5.0.3:
30051 -----------------------------------------
30053 Alexandre Julliard (2):
30054 git.el: Avoid appending a signoff line that is already present.
30055 git.el: Retrieve commit log information from .dotest directory.
30058 git-send-email: Document configuration options
30060 Brian Gernhardt (1):
30061 Fix diff-options references in git-diff and git-format-patch
30063 Frank Lichtenheld (1):
30064 cvsserver: asciidoc formatting changes
30066 J. Bruce Fields (7):
30067 glossary: fix overoptimistic automatic linking of defined terms
30068 user-manual: fix inconsistent example
30069 user-manual: fix inconsistent use of pull and merge
30070 user-manual: fix missing colon in git-show example
30071 user-manual: fix rendering of history diagrams
30072 user-manual: install user manual stylesheet with other web documents
30073 git-merge: warn when -m provided on a fast forward
30076 Documentation: s/seperator/separator/
30077 fast-import: grow tree storage more aggressively
30079 Johannes Schindelin (2):
30080 Begin SubmittingPatches with a check list
30081 make t8001 work on Mac OS X again
30083 Junio C Hamano (3):
30084 git-commit: cd to top before showing the final stat
30085 git-checkout: fix "eval" used for merge labelling.
30088 Matthias Kestenholz (1):
30089 Adjust reflog filemode in shared repository
30091 Matthias Lederhofer (1):
30092 setup_git_directory_gently: fix off-by-one error
30094 Shawn O. Pearce (13):
30095 git-gui: Relocate the menu/transport menu code.
30096 git-gui: Add Reset to the Branch menu.
30097 git-gui: Don't create empty (same tree as parent) commits.
30098 git-gui: Remove unnecessary /dev/null redirection.
30099 fast-import: Avoid infinite loop after reset
30100 fast-import: Fail if a non-existant commit is used for merge
30101 git-gui: Make 'make' quieter by default
30102 Catch write_ref_sha1 failure in receive-pack
30103 git-gui: Allow committing empty merges
30104 git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed." This reverts commit 92446aba47b0e0db28f7b858ea387efcca30ab44.
30105 git-gui: Revert "git-gui: Display all authors of git-gui." This reverts commit 871f4c97ad7e021d1a0a98c80c5da77fcf70e4af.
30106 git-gui: Allow 'git gui version' outside of a repository
30107 Don't package the git-gui credits file anymore
30110 Add definition of <commit-ish> to the main git man page.
30113 Clarify doc for git-config --unset-all.
30116 Version v1.5.0.3; changes since v1.5.0.2:
30117 -----------------------------------------
30119 Alexandre Julliard (1):
30120 git.el: Set the default commit coding system from the repository config.
30122 Aneesh Kumar K.V (1):
30123 blameview: Fix the browse behavior in blameview
30125 Christian Schlotter (1):
30126 Documentation: Correct minor typo in git-add documentation.
30128 Eygene Ryabinkin (2):
30129 http-push.c::lock_remote(): validate all remote refs.
30130 Another memory overrun in http-push.c
30133 git-cvsexportcommit: don't cleanup .msg if not yet committed to cvs.
30134 Fix quoting in update hook template
30136 J. Bruce Fields (6):
30137 Documentation: mention module option to git-cvsimport
30138 user-manual: reset to ORIG_HEAD not HEAD to undo merge
30139 user-manual: ensure generated manual references stylesheet
30140 user-manual: insert earlier of mention content-addressable architecture
30141 user-manual: how to replace commits older than most recent
30142 user-manual: more detailed merge discussion
30145 diff --cc: integer overflow given a 2GB-or-larger file
30147 Johannes Schindelin (3):
30148 fetch.o depends on the headers, too.
30149 builtin-archive: use RUN_SETUP
30150 Document the config variable format.suffix
30152 Junio C Hamano (5):
30153 git-apply: do not fix whitespaces on context lines.
30154 Documentation: git-remote add [-t <branch>] [-m <branch>] [-f] name url
30155 Start preparing Release Notes for 1.5.0.3
30156 git-merge: fail correctly when we cannot fast forward.
30159 Linus Torvalds (2):
30160 mailinfo: do not get confused with logical lines that are too long.
30161 git-show: Reject native ref
30163 Matthias Kestenholz (1):
30164 Fix git-gc usage note
30166 Michael Coleman (2):
30167 Fix minor typos/grammar in user-manual.txt
30168 builtin-fmt-merge-msg: fix bugs in --file option
30171 Correct ordering in git-cvsimport's option documentation
30174 git-archimport: support empty summaries, put summary on a single line.
30176 Ramsay Allan Jones (5):
30177 Fix a "label defined but unreferenced" warning.
30178 Fix an "implicit function definition" warning.
30179 Fix some "comparison is always true/false" warnings.
30180 Fix a "pointer type missmatch" warning.
30181 Unset NO_C99_FORMAT on Cygwin.
30184 Documentation/build-docdep.perl: Fix dependencies for included asciidoc files
30185 Documentation/git-quiltimport.txt: Fix labeled list formatting
30186 Documentation/git-send-email.txt: Fix labeled list formatting
30188 Shawn O. Pearce (1):
30189 index-pack: Loop over pread until data loading is complete.
30192 Fix git-show man page formatting in the EXAMPLES section
30194 Uwe Kleine-König (1):
30195 Include config.mak in doc/Makefile
30198 glossary: Add definitions for dangling and unreachable objects
30201 Version v1.5.0.2; changes since v1.5.0.1:
30202 -----------------------------------------
30204 Christian Schlotter (1):
30205 git-clone: Sync documentation to usage note.
30207 Dmitry V. Levin (1):
30208 git-show-ref --verify: Fail if called without a reference
30210 Fredrik Kuivinen (1):
30211 Fix 'git commit -a' in a newly initialized repository
30214 Add a compat/strtoumax.c for Solaris 8.
30215 Obey NO_C99_FORMAT in fast-import.c.
30216 Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c.
30218 Johannes Schindelin (1):
30219 git-diff: fix combined diff
30221 Junio C Hamano (11):
30222 Reword git-am 3-way fallback failure message.
30223 diff-patch: Avoid emitting double-slashes in textual patch.
30224 Don't modify CREDITS-FILE if it hasn't changed.
30225 rerere: do not skip two conflicted paths next to each other.
30226 rerere: do not deal with symlinks.
30227 Add Release Notes to prepare for 1.5.0.2
30228 merge-index: fix longstanding bug in merging symlinks
30229 merge-recursive: fix longstanding bug in merging symlinks
30230 diff --cc: fix display of symlink conflicts during a merge.
30231 Documentation: describe "-f/-t/-m" options to "git-remote add"
30234 Martin Koegler (1):
30235 git-gui: Create new branches from a tag.
30237 Michael Loeffler (1):
30238 Use gunzip -c over gzcat in import-tars example.
30241 git-remote: support remotes with a dot in the name
30243 Robin Rosenberg (1):
30244 Limit filename for format-patch
30247 Allow arbitrary number of arguments to git-pack-objects
30250 core.legacyheaders: Use the description used in RelNotes-1.5.0
30252 Shawn O. Pearce (16):
30253 git-gui: Refactor 'exec git subcmd' idiom.
30254 git-gui: Basic version check to ensure git 1.5.0 or later is used.
30255 git-gui: Permit merging tags into the current branch.
30256 git-gui: More consistently display the application name.
30257 git-gui: Print version on the console.
30258 git-gui: Prefer version file over git-describe.
30259 git-gui: Expose the browser as a subcommand.
30260 git-gui: Correct crash when saving options in blame mode.
30261 git-gui: Use mixed path for docs on Cygwin.
30262 git-gui: Display all authors of git-gui.
30263 git-gui: Change summary of git-gui.
30264 git-gui: Include browser in our usage message.
30265 git-gui: Remove TODO list.
30266 git-gui: Don't crash in citool mode on initial commit.
30267 Document the new core.bare configuration option.
30268 Include git-gui credits file in dist.
30271 Version v1.5.0.1; changes since v1.5.0:
30272 ---------------------------------------
30274 Alexandre Julliard (2):
30275 git-daemon: Avoid leaking the listening sockets into child processes.
30276 sha1_file.c: Round the mmap offset to half the window size.
30278 Fredrik Kuivinen (2):
30279 Read the config in rev-list
30280 Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding
30282 Junio C Hamano (15):
30283 Documentation: Drop full-stop from git-fast-import title.
30284 cmd-list: add git-remote
30285 Makefile: update check-docs target
30286 Clarify two backward incompatible repository options.
30287 Still updating 1.5.0 release notes.
30288 Add RelNotes 1.5.0.1
30289 Make sure packedgitwindowsize is multiple of (pagesize * 2)
30290 Make gitk work reasonably well on Cygwin.
30291 gitk: Use show-ref instead of ls-remote
30292 GIT-VERSION-FILE: check ./version first.
30293 pretend-sha1: grave bugfix.
30294 git-merge: minor fix for no_trivial_merge_strategies.
30295 Do not take mode bits from index after type change.
30296 Update draft release notes for 1.5.0.1
30300 gitk - remove trailing whitespace from a few lines.
30301 Make gitk save and restore the user set window position.
30302 Make gitk save and restore window pane position on Linux and Cygwin.
30305 Minor corrections to release notes
30307 Paul Mackerras (1):
30308 Change git repo-config to git config
30310 Shawn O. Pearce (2):
30311 Attempt to improve git-rebase lead-in description.
30312 Convert update-index references in docs to add.
30315 git-blame: prevent argument parsing segfault
30318 Version v1.5.0; changes since v1.5.0-rc4:
30319 -----------------------------------------
30321 Alexandre Julliard (3):
30322 diff.c: Reuse the pprint_rename function for diff --summary output.
30323 diff.c: Properly quote file names in diff --summary output.
30324 diff.c: More logical file name quoting for renames in diffstat.
30327 git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull"
30328 Fix potential command line overflow in hooks--update
30330 Aneesh Kumar K.V (1):
30331 blameview: Move the commit info to a pane below the blame window.
30334 Handle uncommitted changes and cache descriptions
30335 git-blame.el: improve color handling
30336 git-blame.el: blame unsaved changes
30337 git-blame.el: Doc fixes and cleanup
30338 git-blame.el: Autoupdate while editing
30341 Make it easier to override path to asciidoc command
30344 git-svn: correctly handle boolean options via git-config
30346 Jakub Narębski (2):
30347 git-blame: Add Emacs Lisp file headers and GNU GPL boilerplate
30348 git-blame: Change installation instructions
30351 Read cvsimport options from repo-config
30353 Johannes Schindelin (5):
30354 for_each_reflog_ent: be forgiving about missing message
30355 log --reflog: honour --relative-date
30356 format-patch -n: make sorting easier by padding number
30357 log --reflog: use dwim_log
30358 git-gc: run pack-refs by default unless the repo is bare
30360 Junio C Hamano (17):
30361 create_symref(): create leading directories as needed.
30362 reflog: handle $name => remotes/%s/HEAD mapping consistently for logs
30363 Documentation/git-pull: describe default behaviour and config interactions
30364 git-fetch: document automatic tag following.
30365 wt_status_prepare(): clean up structure initialization.
30366 diff_flush_name(): take struct diff_options parameter.
30367 t4016: test quoting funny pathnames in diff output
30368 Documentation: git-rebase -C<n>
30369 Teach git-am to pass -p option down to git-apply
30370 Add discussion section to git-tag documentation.
30371 Add RPM target for git-gui
30372 Do not forget to pack objects reachable from HEAD reflog.
30373 for-each-reflog: not having $GIT_DIR/logs directory is not an error.
30374 "git-fetch --tags $URL" should not overwrite existing tags
30375 Documentation: Moving out of detached HEAD does not warn anymore.
30376 Add release notes to the distribution.
30379 Linus Torvalds (2):
30381 Mark places that need blob munging later for CRLF conversion.
30384 Make gitk save and restore the user set window position.
30385 Make gitk save and restore window pane position on Linux and Cygwin.
30387 Matthias Lederhofer (1):
30388 git merge documentation: -m is optional
30390 Michael Loeffler (1):
30391 import-tars: brown paper bag fix for file mode.
30393 Michael S. Tsirkin (3):
30394 Update git-log and git-show documentation
30395 add -C[NUM] to git-am
30396 Document that git-am can read standard input.
30399 Work around Subversion race in git-svn tests.
30402 Fixed some typos in git-repack docs
30405 remove mailmap.linux
30406 Update RPM core package description
30409 Clarify that git-update-server-info should be run for every git-push
30412 Avoid ugly linewrap in git help
30414 Shawn O. Pearce (313):
30415 git-gui: Initial revision.
30416 git-gui: Additional early feature development.
30417 git-gui: Fixed UI layout problems on Windows.
30418 git-gui: Corrected keyboard bindings on Windows, improved state management.
30419 git-gui: Verify we should actually perform a commit when asked to do so.
30420 git-gui: Finished commit implementation.
30421 git-gui: Implemented amended commits.
30422 git-gui: Misc. nit type of bug fixes.
30423 git-gui: Started construction of fetch and push operations.
30424 git-gui: Worked around environment variable problems on Windows.
30425 git-gui: Reorganized startup procedure to ensure gitdir is right.
30426 git-gui: Fix menu item accelerator display on Mac OS X.
30427 git-gui: Correctly handle CR vs. LF within the console of fetch.
30428 git-gui: Check for fetch or push command failure and denote it.
30429 git-gui: Don't complain if no .git/remotes exist.
30430 git-gui: Added current TODO list.
30431 git-gui: Last minute idea about fetch shortcuts.
30432 git-gui: Automatically reopen any console closed by the user.
30433 git-gui: Cache all repo-config data in an array.
30434 git-gui: Added support for pulling from default branch of a remote.
30435 git-gui: Updated TODO list now that pull is starting to work.
30436 git-gui: Corrected diff-index/diff-files protocol parsing errors.
30437 git-gui: Performance improvements for large file sets.
30438 git-gui: More performance improvements to rescan logic.
30439 git-gui: Flip commit message buffer and diff area.
30440 git-gui: Added repack database menu option, to invoke git repack.
30441 git-gui: Allow the user to disable update-index --refresh during rescan.
30442 git-gui: Grab the index lock while running pull.
30443 git-gui: Pluralize timestamps within the options menu.
30444 git-gui: Disable pull menu items when the index is locked.
30445 git-gui: Don't let the user pull into an uncommitted working directory.
30446 git-gui: Update TODO list.
30447 git-gui: Bug fix for bad variable reference in display_file.
30448 git-gui: Changed term 'check-in' to 'include'.
30449 git-gui: Show only the abbreviated SHA1 after committing.
30450 git-gui: Cache the GIT_COMMITTER_IDENT value on first sign-off.
30451 git-gui: Save window geometry to .git/config during exit.
30452 git-gui: Change accelerator for "Include All" to M1-I.
30453 git-gui: Created edit menu and basic editing bindings.
30454 git-gui: Clear undo/redo stack when loading a message file from disk.
30455 git-gui: Updated TODO list now that geometry is stored.
30456 git-gui: Always indicate the file in the diff viewer.
30457 git-gui: Correctly handle files containing LF in their name.
30458 git-gui: Efficiently update the UI after committing.
30459 git-gui: Use catch rather than array names to check file.
30460 git-gui: Rename difffont/mainfont variables.
30461 git-gui: Use native tk_messageBox for errors.
30462 git-gui: Cleaned up error message formatting.
30463 git-gui: Simplified format of geometry configuration.
30464 git-gui: Misc. formatting cleanups.
30465 git-gui: Misc. bug fixes for mouse click crashes.
30466 git-gui: Added context menus for consoles and commit message buffer.
30467 git-gui: Fix mouse cursor behavior when in widgets.
30468 git-gui: Teach sign off to be more intelligent.
30469 git-gui: Corrected font used for options menu items.
30470 git-gui: Honor system font and let user configure fonts.
30471 git-gui: Allow the user to change the diff viewer font size.
30472 git-gui: Refresh a file if it has an empty diff.
30473 git-gui: Make use of the Tk font system rather than faking it.
30474 git-gui: Improve right click context menu binding on all platforms.
30475 git-gui: Rename quitting global to is_quitting.
30476 git-gui: Use arrow cursor rather than left_ptr.
30477 git-gui: Refactor options menu into an options dialog.
30478 git-gui: Allow the user to manipulate the fonts from the options panel.
30479 git-gui: Supply progress feedback when running update-index.
30480 git-gui: Minor options dialog UI cleanups.
30481 git-gui: Added Options... menu item to end of diff context menu.
30482 git-gui: Use 'after 1' to post UI rather than tkwait.
30483 git-gui: Correct bugs in font config handling.
30484 git-gui: Hide non-commit related commands when invoked as git-citool.
30485 git-gui: Don't load the global options unless necessary.
30486 git-gui: Allow the user to disable diff stat summary during pull.
30487 git-gui: Run the pre-commit hook in the background.
30488 git-gui: Remove the commit_active global variable.
30489 git-gui: Added post-commit invocation after the commit is done.
30490 git-gui: Always use eq/ne for string comparsions.
30491 git-gui: Reshow diff if we sent the file to update-index.
30492 git-gui: Cleanup diff construction code to prepare for more options.
30493 git-gui: Allow the user to control the number of context lines in a diff.
30494 git-gui: Sort the list of paths being updated in the index.
30495 git-gui: Use a smaller pipe buffer for update-index.
30496 git-gui: Allow the user to copy name of the file in the diff viewer.
30497 git-gui: Correct language for M_/A_ status codes.
30498 git-gui: Display status on left in diff header.
30499 git-gui: Minor UI layout improvements for console windows.
30500 git-gui: Reverted file name text field to a label.
30501 git-gui: By default don't allow partially included files.
30502 git-gui: Refactor mouse clicking on file names/icons.
30503 git-gui: Narrow the no differences information message.
30504 git-gui: Implemented multiple selection in file lists.
30505 git-gui: Refactor update_status -> rescan.
30506 git-gui: Provide an after-rescan script to rescan.
30507 git-gui: Allow update_index to also run a script when it completes.
30508 git-gui: Automatically update-index all included files before commit.
30509 git-gui: Disable diff actions when no diff is active.
30510 git-gui: Created makefile to install the program.
30511 git-gui: Correctly handle GIT_DIR environment variable.
30512 git-gui: Create Windows shortcut icons for git-gui.
30513 git-gui: Protect ourselves from funny GIT_DIR/working directory setups.
30514 git-gui: Handle ' within paths when creating Windows shortcuts.
30515 git-gui: Only populate a fetch or push if we have an action.
30516 git-gui: Create a .app file on MacOS X if requested.
30517 git-gui: Display error dialog on Mac OS X when no .git found.
30518 git-gui: Make initial commits work properly.
30519 git-gui: Only reshow diff when really necessary.
30520 git-gui: Refactor file state representations.
30521 git-gui: Add menu option to include only selected files.
30522 git-gui: Misc. comment formatting cleanups.
30523 git-gui: Start UI with the index locked.
30524 git-gui: Remove completed items from TODO list.
30525 git-gui: Toggle between new commit and amend commit modes.
30526 git-gui: Verify the user has GIT_COMMITTER_IDENT before comitting.
30527 git-gui: Rephrase rescan before commit informational message.
30528 git-gui: Allow adding untracked files in selection.
30529 git-gui: Don't create PkgInfo on Mac OS X "desktop icons".
30530 git-gui: Teach the gui how to uninclude a file.
30531 git-gui: Make consecutive icon clicks toggle included status of a file.
30532 git-gui: Correct toggling of deleted file status.
30533 git-gui: Fix list loading corruption introduced by 1461c5f3.
30534 git-gui: Describe deleted symlinks in a more friendly way.
30535 git-gui: Correct toggling of added/untracked status for new files.
30536 git-gui: Updated TODO list now that a task is complete.
30537 git-gui: Refactored diff line display formatting logic.
30538 git-gui: Restore the all important shebang line.
30539 git-gui: Update in memory states after commit.
30540 git-gui: Correct some state matchings for include/remove.
30541 git-gui: Improve handling of merge commits.
30542 git-gui: Allow users to run fsck-objects from the gui.
30543 git-gui: Don't save amended commit message buffer.
30544 git-gui: Reworded verify console title.
30545 git-gui: Seperate out the database operations in project menu.
30546 git-gui: Rename Project menu to Repository.
30547 git-gui: Added about dialog box.
30548 git-gui: Be more Macintosh like.
30549 git-gui: Make the copyright notice serve double duty.
30550 git-gui: Include the Tcl/Tk version in the about dialog.
30551 git-gui: Abstract out windows platform test to is_Windows proc.
30552 git-gui: Correct is_MacOSX platform test.
30553 git-gui: Warn Cygwin users about possible environment issues.
30554 git-gui: Added configuration editor TODO list.
30555 git-gui: Refactor M1 binding selection.
30556 git-gui: Added menu command to visualize all branches.
30557 git-gui: Don't start 'gitk --all' on Mac OS X.
30558 git-gui: Improve pull error dialogs.
30559 git-gui: Added revert changes command.
30560 git-gui: Display the current branch.
30561 git-gui: Support file state MD (modified/deleted).
30562 git-gui: Created Branch menu.
30563 git-gui: Parse off refs/remotes when showing current branch.
30564 git-gui: Abort on not implemented branch switching.
30565 git-gui: Automatically skip tracking branches in branch menu.
30566 git-gui: Rename all_branches -> all_heads.
30567 git-gui: Misc. comment and formatting cleanups.
30568 git-gui: Started implementation of switch_branch.
30569 git-gui: Set a proper title on our revert confirm dialog box.
30570 git-gui: Updated todo list.
30571 git-gui: Enable resolution of merge conflicts.
30572 git-gui: Auto-update any A? or M? files during rescan.
30573 git-gui: Reworded 'Include' to 'Add' to match core Git.
30574 git-gui: Created very crude Tools menu, to support miga.
30575 git-gui: Show all fetched branches for remote pulls.
30576 git-gui: Run git-gc rather than git-repack.
30577 git-gui: Corrected behavior of deleted (but existing in HEAD) files.
30578 git-gui: Correct wording of the revert confirmation dialog.
30579 git-gui: Work around odd cygpath bug on Windows.
30580 git-gui: Change more 'include' language to 'add'.
30581 git-gui: Hide the ugly bash command line from the windows desktop icon.
30582 git-gui: Modified makefile to embed version into git-gui script.
30583 git-gui: Display the git-gui version in the Help->About dialog.
30584 git-gui: Display the full GPL copyright notice in about dialog.
30585 git-gui: Ensure version number is always current.
30586 git-gui: Allow the user to copy the version data to the clipboard.
30587 git-gui: Don't offer my miga hack if its configuration file isn't present.
30588 git-gui: Suggest when running 'git gc' may be worthwhile.
30589 git-gui: Refactor reponame computation.
30590 git-gui: Cleanup usage of gitdir global variable.
30591 git-gui: Allow [gitdir ...] to act as [file join [gitdir] ...].
30592 git-gui: Make the gitk starting message match our usual format.
30593 git-gui: Display the directory we are entering during startup.
30594 git-gui: Start file status display refactoring.
30595 git-gui: Convert UI to use 'staged for commit' interface.
30596 git-gui: Correct DD file state to be only D_.
30597 git-gui: Remove invalid DM state.
30598 git-gui: Cleanup state descriptions.
30599 git-gui: Refactor add/remove proc names to align with reality.
30600 git-gui: Add or unstage based on the specific icon used.
30601 git-gui: Refactor the revert (aka checkout-index) implementation.
30602 git-gui: Refactor the add to commit state filters.
30603 git-gui: Simplify printing of index info to update-index.
30604 git-gui: Only permit selection in one list at a time.
30605 git-gui: Pad the cancel/save buttons in the options window.
30606 git-gui: Implemented create branch GUI.
30607 git-gui: Bind M1-N to create branch.
30608 git-gui: Implemented local branch deletion.
30609 git-gui: Allow users to delete branches merged upstream.
30610 git-gui: Allow creating branches from tracking heads.
30611 git-gui: Use borders on text fields in branch dialog.
30612 git-gui: Remove 'Allow Partially Added Files' option.
30613 git-gui: Move commit_prehook into commit_tree.
30614 git-gui: Improve the branch delete confirmation dialogs.
30615 git-gui: Don't delete the test target branch.
30616 git-gui: Attempt to checkout the new branch after creation.
30617 git-gui: Refactor current_diff -> current_diff_path.
30618 git-gui: Remove combined diff showing behavior.
30619 git-gui: Improve the display of merge conflicts.
30620 git-gui: Improve diff --cc viewing for unmerged files.
30621 git-gui: Fix bug in unmerged file display.
30622 git-gui: Clear diff from viewer if the side changed.
30623 git-gui: Correct disappearing unstaged files.
30624 git-gui: Add Refresh to diff viewer context menu.
30625 git-gui: Correct unmerged file detection at commit time.
30626 git-gui: Pad new branch name input box.
30627 git-gui: Use a grid layout for branch dialog.
30628 git-gui: Improve the merge check interface for branch deletion.
30629 git-gui: Change rude error popup to info popup.
30630 git-gui: Correctly ignore '* Unmerged path' during diff.
30631 git-gui: Make diff viewer colors match gitk's defaults.
30632 git-gui: Never line wrap in file lists.
30633 git-gui: Don't offer tracking branches if none exist.
30634 git-gui: Give a better error message on an empty branch name.
30635 git-gui: Allow user to specify a branch name pattern.
30636 git-gui: Improve keyboard traversal in dialogs.
30637 git-gui: Fully select a field when entering into it.
30638 git-gui: Automatically toggle the relevant radio buttons.
30639 git-gui: Correctly categorize tracking branches and heads.
30640 git-gui: Update todo list with finished and new items.
30641 git-gui: Slightly tweak new window geometry.
30642 git-gui: Create missing branch head on initial commit.
30643 git-gui: Don't format the mode line of a diff.
30644 git-gui: Force an update-index --refresh on unchanged files.
30645 git-gui: Don't attempt to tag new file/deleted file headers in diffs.
30646 git-gui: Fix 'Select All' action on Windows.
30647 git-gui: Ignore 'No newline at end of file' marker line.
30648 git-gui: Always start a rescan on an empty diff.
30649 git-gui: Don't show content of untracked binary files.
30650 git-gui: Limit display of large untracked files.
30651 git-gui: When possible show the type of an untracked file.
30652 git-gui: Don't try to tag the 'Binary files * and * differ' line.
30653 git-gui: Remove spurious newline in untracked file display.
30654 git-gui: Honor system encoding for filenames.
30655 git-gui: Handle commit encoding better.
30656 git-gui: Display database stats (count-objects -v) on demand.
30657 git-gui: Implement basic branch switching through read-tree.
30658 git-gui: Use system default labelframe bordering.
30659 git-gui: Display the size of the pack directory.
30660 git-gui: Only allow Refresh in diff context menu when we have a diff.
30661 git-gui: Allow staging/unstaging individual diff hunks.
30662 git-gui: Elide CRs appearing in diff output from display.
30663 git-gui: Cleanup end-of-line whitespace in commit messages.
30664 git-gui: Unset unnecessary UI setup variable.
30665 git-gui: Force focus to the diff viewer on mouse click.
30666 git-gui: Support 'Visualize All Branches' on Mac OS X.
30667 git-gui: Pad the database statistics dialog window.
30668 git-gui: Prefer Tk's entry widget over a 1 line text field.
30669 git-gui: Remove Pull menu and cleanup Branch/Fetch/Push menus.
30670 git-gui: Don't switch branches if changing to the current branch.
30671 git-gui: Maintain the same file list for diff during refresh.
30672 git-gui: Always use lsearch -exact, to prevent globbing.
30673 git-gui: Added arbitrary branch pushing support.
30674 git-gui: Remove no longer used pull from remote code.
30675 git-gui: Always use -v option to push.
30676 git-gui: Refactor console success/failure handling.
30677 git-gui: Use builtin version of 'git gc'.
30678 git-gui: Implement local merge operations.
30679 git-gui: Let users abort with `reset --hard` type logic.
30680 git-gui: Update status bar during a merge.
30681 git-gui: Don't allow users to commit a bad octopus merge.
30682 git-gui: Don't allow merges in the middle of other things.
30683 git-gui: Always offer scrollbars for branch lists.
30684 git-gui: Support merge.summary, merge.verbosity.
30685 git-gui: Reword meaning of merge.summary.
30686 git-gui: Offer quick access to the HTML formatted documentation.
30687 git-gui: Test for Cygwin differently than from Windows.
30688 git-gui: Implemented file browser and incremental blame.
30689 git-gui: Improve the icons used in the browser display.
30690 git-gui: Display the current branch name in browsers.
30691 git-gui: Allow users to edit user.name, user.email from options.
30692 git-gui: Use -M and -C when running blame.
30693 git-gui: Correctly handle spaces in filepaths.
30694 git-gui: Display original filename and line number in blame.
30695 git-gui: Install column headers in blame viewer.
30696 git-gui: Use a grid layout for the blame viewer.
30697 git-gui: Assign background colors to each blame hunk.
30698 Correct ^0 asciidoc syntax in fast-import docs.
30699 Correct some language in fast-import documentation.
30700 Correct spelling of fast-import in docs.
30701 tar archive frontend for fast-import.
30702 git-gui: Update known branches during rescan.
30703 git-gui: Support keyboard traversal in browser.
30704 git-gui: Replace \ with \\ when showing paths.
30705 git-gui: Refactor single_commit to a proc.
30706 git-gui: Separate transport/branch menus from multicommit.
30707 git-gui: Optionally save commit buffer on exit.
30708 git-gui: View blame from the command line.
30709 git-gui: Select subcommands like git does.
30710 git-gui: Relabel the Add All action.
30711 git-gui: Use git-config now over git-repo-config.
30712 git-gui: Redesign the display of annotated files.
30713 git-gui: Jump to the first annotation block as soon as its available.
30714 git-gui: Improve annotated file display.
30715 git-gui: Focus into blame panels on Mac OS.
30716 git-gui: Stop deleting gitk preferences.
30717 fast-import: Hide the pack boundary commits by default.
30718 fast-import: Add tip about importing renames.
30719 bash: Hide git-fast-import.
30720 fast-import: Support reusing 'from' and brown paper bag fix reset.
30721 git-gui: Allow gitexecdir, INSTALL to be set by the caller.
30722 git-gui: Rename GIT_VERSION to GITGUI_VERSION.
30723 git-gui: Generate a version file on demand.
30724 git-gui: Handle gitgui tags in version gen.
30725 git-gui: Guess our version accurately as a subproject.
30726 git-gui: Change base version to 0.6.
30727 Link git-gui into the master Makefile.
30730 Print a sane error message if an alias expands to an invalid git command
30731 Allow aliases to expand to shell commands
30734 Version v1.5.0-rc4; changes since v1.5.0-rc3:
30735 ---------------------------------------------
30738 Avoid ActiveState Perl IO in t800[12]
30741 doc: hooks.txt said post-commit default sends an email, it doesn't
30742 git-for-each-ref doesn't return "the bit after $GIT_DIR/refs"
30744 Aneesh Kumar K.V (1):
30745 blameview: Support browsable functionality to blameview.
30748 git-blame: an Emacs minor mode to view file with git-blame output.
30751 git-svn: do not let Git.pm warn if we prematurely close pipes
30752 Disallow invalid --pretty= abbreviations
30755 git-archimport: initial import needs empty directory
30757 Horst H. von Brand (1):
30758 Call make always with CFLAGS in git.spec
30760 Johannes Schindelin (4):
30761 Teach the '@{...}' notation to git-log -g
30762 Update the documentation for the new '@{...}' syntax
30763 Commands requiring a work tree must not run in GIT_DIR
30764 fast-import: Fix compile warnings
30766 Junio C Hamano (36):
30767 create_symref(): do not assume pathname from git_path() persists long enough
30768 detached HEAD -- finishing touches
30769 Use "git checkout -q" in git-bisect
30770 Tutorial: fix asciidoc formatting of "git add" section.
30771 Tutorial-2: Adjust git-status output to recent reality.
30772 core-tutorial: http reference link fix
30773 fix reflog entries for "git-branch"
30774 honor GIT_REFLOG_ACTION in git-commit
30775 Why is it bad to rewind a branch that has already been pushed out?
30776 combine-diff: special case --unified=0
30777 show-branch -g: default to the current branch.
30778 git-clone --reference: saner handling of borrowed symrefs.
30779 Revert "Allow branch.*.merge to talk about remote tracking branches."
30780 Rename get_ident() to fmt_ident() and make it available to outside
30781 t9200: Work around HFS+ issues.
30782 bisect: it needs to be done in a working tree.
30783 git-blame: no rev means start from the working tree file.
30784 Add pretend_sha1_file() interface.
30785 Use pretend_sha1_file() in git-blame and git-merge-recursive.
30786 blame: document --contents option
30787 Teach git-remote add to fetch and track
30788 Fix longstanding mismerge of ALL_CFLAGS vs BASIC_CFLAGS
30789 gitk: Use show-ref instead of ls-remote
30790 git-push: allow globbing wildcard refspec.
30791 gitweb: fix mismatched parenthesis
30792 annotate: fix for cvsserver.
30794 Remove contrib/colordiff
30795 Add deprecation notices.
30796 Remove git-merge-recur
30797 git-clone --reference: work well with pack-ref'ed reference repository
30798 for-each-reflog: fix case for empty log directory
30799 t4200: skip gc-rerere test on systems with non GNU date.
30800 git-add -i: update removed path correctly.
30801 Documentation: Add gfi to the main command list.
30804 Linus Torvalds (2):
30805 pager: Work around window resizing bug in 'less'
30806 Fix "git log -z" behaviour
30809 gitk - remove trailing whitespace from a few lines.
30810 Make gitk work reasonably well on Cygwin.
30812 Michael Coleman (1):
30813 Fix some documentation typos and grammar
30815 Michele Ballabio (1):
30816 Documentation: add KMail in SubmittingPatches
30818 Nicolas Pitre (14):
30819 make reflog filename independent from struct ref_lock
30820 lock_ref_sha1_basic(): remember the original name of a ref when resolving it
30821 enable separate reflog for HEAD
30822 add reflog entries for HEAD when detached
30823 move create_symref() past log_ref_write()
30824 add logref support to git-symbolic-ref
30825 add reflog when moving HEAD to a new branch
30826 reword the detached head message a little again
30827 add a quiet option to git-checkout
30828 prevent HEAD reflog to be interpreted as current branch reflog
30829 provide a nice @{...} syntax to always mean the current branch reflog
30830 scan reflogs independently from refs
30831 Enable HEAD@{...} and make it independent from the current branch
30832 Let git-checkout always drop any detached head
30835 git-config --rename-section could rename wrong section
30836 Assorted typo fixes
30838 Robin Rosenberg (1):
30839 Why is it bad to rewind a branch that has already been pushed out?
30841 Shawn O. Pearce (113):
30842 Created fast-import, a tool to quickly generating a pack from blobs.
30843 Added automatic index generation to fast-import.
30844 Cleaned up memory allocation for object_entry structs.
30845 Refactored fast-import's internals for future additions.
30846 Added basic command handler to fast-import.
30847 Implemented branch handling and basic tree support in fast-import.
30848 Added tree and commit writing to fast-import.
30849 Implement blob ID validation in fast-import.
30850 Converted fast-import to a text based protocol.
30851 Changed fast-import's pack header creation to use pack.h
30852 Allow symlink blobs in trees during fast-import.
30853 Fixed segfault in fast-import after growing a tree.
30854 Converted fast-import to accept standard command line parameters.
30855 Added mark store/find to fast-import.
30856 Added branch load counter to fast-import.
30857 Implemented 'tag' command in fast-import.
30858 Implemented tree reloading in fast-import.
30859 Round out memory pool allocations in fast-import to pointer sizes.
30860 Remove branch creation command from fast-import.
30861 Moved from command to after data to help cvs2svn.
30862 Account for tree entry memory costs in fast-import.
30863 Added option to export the marks table when fast-import terminates.
30864 Added --branch-log to option to fast-import.
30865 Fixed GPF in fast-import caused by unterminated linked list.
30866 Fixed compile error in fast-import.
30867 Map only part of the generated pack file at any point in time.
30868 Added 'reset' command to clear a branch's tree.
30869 Don't crash fast-import if no branch log was requested.
30870 Converted hash memcpy/memcmp to new hashcpy/hashcmp/hashclr.
30871 Implemented tree delta compression in fast-import.
30872 Recycle data buffers for tree generation in fast-import.
30873 Reuse the same buffer for all commits/tags in fast-import.
30874 Replace ywrite in fast-import with the standard write_or_die.
30875 Correct tree corruption problems in fast-import.
30876 Additional fast-import tree delta corruption cleanups.
30877 Fix repository corruption when using marks for modified blobs.
30878 Support creation of merge commits in fast-import.
30879 Allow creating branches without committing in fast-import.
30880 Improve reuse of sha1_file library within fast-import.
30881 Misc. type cleanups within fast-import.
30882 Restructure fast-import to support creating multiple packfiles.
30883 Remove unnecessary duplicate_count in fast-import.
30884 Implemented manual packfile switching in fast-import.
30885 Don't create a final empty packfile in fast-import.
30886 Optimize index creation on large object sets in fast-import.
30887 Implemented automatic checkpoints within fast-import.
30888 Print the packfile names to stdout from fast-import.
30889 Corrected buffer overflow during automatic checkpoint in fast-import.
30890 Use uintmax_t for marks in fast-import.
30891 Replace redundant yread() with read_in_full() in fast-import.
30892 Reuse sha1 in packed_git in fast-import.
30893 Use .keep files in fast-import during processing.
30894 Ensure we close the packfile after creating it in fast-import.
30895 Remove unnecessary pack_fd global in fast-import.
30896 Correct max_packsize default in fast-import.
30897 Correct object_count type and stat output in fast-import.
30898 Print out the edge commits for each packfile in fast-import.
30899 Corrected BNF input documentation for fast-import.
30900 Correct a few types to be unsigned in fast-import.
30901 Declare no-arg functions as (void) in fast-import.
30902 Correct packfile edge output in fast-import.
30903 Always use struct pack_header for pack header in fast-import.
30904 Use fixed-size integers when writing out the index in fast-import.
30905 Remove unnecessary options from fast-import.
30906 Support delimited data regions in fast-import.
30907 Create test case for fast-import.
30908 Reduce value duplication in t9300-fast-import.
30909 Accept 'inline' file data in fast-import commit structure.
30910 Pull out remote listing functions in git-remote.
30911 Teach 'git remote' how to cleanup stale tracking branches.
30912 Cleanup prepare_packed_git_one to reuse install_packed_git.
30913 Correct comment in prepare_packed_git_one.
30914 Refactor open_packed_git to return an error code.
30915 Don't find objects in packs which aren't available anymore.
30916 Don't leak file descriptors from unavailable pack files.
30917 Cleanup subcommand documentation for git-remote.
30918 Keep untracked files not involved in a merge.
30919 Default GIT_MERGE_VERBOSITY to 5 during tests.
30920 bash: Remove short option completions for branch/checkout/diff.
30921 bash: Classify cat-file and reflog as plumbing.
30922 bash: Complete long options to git-add.
30923 bash: Add space after unique command name is completed.
30924 bash: Classify more commends out of completion.
30925 bash: Support unique completion on git-config.
30926 bash: Support unique completion when possible.
30927 bash: Support internal revlist options better.
30928 Include checkpoint command in the BNF.
30929 Reduce memory usage of fast-import.
30930 Show an example of deleting commits with git-rebase.
30931 bash: Support completion on git-cherry.
30932 bash: Hide diff-stages from completion.
30933 bash: Offer --prune completion for git-gc.
30934 bash: Hide git-resolve, its deprecated.
30935 bash: Support --add completion to git-config.
30936 bash: Support git-bisect and its subcommands.
30937 Don't support shell-quoted refnames in fast-import.
30938 Initial draft of fast-import documentation.
30939 bash: Support git-rebase -m continuation completion.
30940 bash: Complete git-remote subcommands.
30941 Remove --branch-log from fast-import.
30942 Correct compiler warnings in fast-import.
30943 Correct minor style issue in fast-import.
30944 Correct fast-import timezone documentation.
30945 Remove unnecessary null pointer checks in fast-import.
30946 Minor fast-import documentation corrections.
30947 Support RFC 2822 date parsing in fast-import.
30948 Don't do non-fastforward updates in fast-import.
30949 Minor timestamp related documentation corrections for fast-import.
30950 Teach fast-import how to clear the internal branch content.
30951 Teach fast-import how to sit quietly in the corner.
30952 Dump all refs and marks during a checkpoint in fast-import.
30953 Don't crash fast-import if the marks cannot be exported.
30954 Add a Tips and Tricks section to fast-import's manual.
30956 Simon 'corecode' Schubert (1):
30957 Allow forcing of a parent commit, even if the parent is not a direct one.
30960 Add hg-to-git conversion utility.
30962 Uwe Kleine-König (1):
30963 add replay and log to the usage string of git-bisect
30966 gitweb: Convert project name to UTF-8
30969 Version v1.5.0-rc3; changes since v1.5.0-rc2:
30970 ---------------------------------------------
30973 Insert ACTIVESTATE_STRING in Git.pm
30974 Force Activestate Perl to tie git command pipe handle to a handle class
30975 Cleanup uninitialized value in chomp
30976 Allow default core.logallrefupdates to be overridden with template's config
30977 Fix git-update-index to work with relative pathnames.
30979 Alexandre Julliard (1):
30980 vc-git.el: Take into account the destination name in vc-checkout.
30983 New files in git weren't being downloaded during CVS update
30984 If abbrev is set to zero in git-describe, don't add the unique suffix
30985 Allow the tag signing key to be specified in the config file
30986 UNIX reference time of 1970-01-01 00:00 is UTC timezone, not local time zone
30987 Heavily expanded update hook to send more useful emails than the old hook
30989 Aneesh Kumar K.V (2):
30990 blameview: Use git-cat-file to read the file content.
30991 Update git-cat-file documentation
30994 Document --check option to git diff.
30997 Improved error message from git-rebase
31000 git-svn: remove leading slash when printing removed directories
31002 J. Bruce Fields (31):
31003 Documentation: add git user's manual
31004 Documentation: expand preface and todo's
31005 Documentation: git-rebase discussion, miscellaneous user-manual updates
31006 Documentation: more user-manual todo's
31007 Documentation: reorder development section, todo's
31008 Documentation: begin discussion of git-remote in user manual
31009 Documentation: rev-list -> rev-parse, other typos, start examples
31010 user manual: answer some comments from Junio
31011 user-manual: replace init-db by init
31012 user-manual: reindent
31013 user-manual: rewrap, fix heading levels
31014 user-manual: add "quick start" as chapter 1
31015 user-manual: minor quickstart reorganization
31016 user-manual: clarify difference between tag and branch
31017 user-manual: update references discussion
31018 user-manual: update git-gc discussion
31019 user-manual: stub discussion of fsck and reflog
31020 user-manual: reorganize fetch discussion, add internals, etc.
31021 user-manual: git-fsck, dangling objects
31022 user-manual: fsck-objects -> fsck
31023 user-manual: repo-config -> config
31024 user-manual: add references to git-config man page
31025 user-manual: typo fix
31026 user-manual: fix a header level
31027 user-manual: reflogs, other recovery
31028 user-manual: rewrap a few long lines
31029 user-manual: minor "TODO" updates
31030 user-manual: document git-show-branch example
31031 user-manual: SHA1 -> object name
31032 user-manual: point to README for gitweb information
31033 user-manual: todo's
31035 Jakub Narębski (3):
31036 Documentation/config.txt: Document config file syntax better
31037 t/t1300-repo-config.sh: value continued on next line
31038 Documentation/config.txt: Correct info about subsection name
31041 Use inttypes.h rather than stdint.h.
31044 format-patch: fix bug with --stdout in a subdirectory
31045 contrib/vim: update syntax for changed commit template
31046 diffcore-pickaxe: fix infinite loop on zero-length needle
31047 Add a sample program 'blameview' to show how to use git-blame --incremental
31049 Johannes Schindelin (2):
31050 annotate: use pager
31051 reflog inspection: introduce shortcut "-g"
31054 Add a missing fork() error check.
31056 Junio C Hamano (43):
31057 User manual: fix typos in examples
31058 Documentation/tutorial-2: Fix interesting typo in an example.
31059 Revert "prune: --grace=time"
31060 Make sure git_connect() always give two file descriptors.
31061 is_repository_shallow(): prototype fix.
31062 shallow repository: disable unsupported operations for now.
31063 git-gc: do not run git-prune by default.
31064 cvsimport: activate -a option, really.
31065 .mailmap: fix screw-ups in Uwe's name
31066 honor --author even with --amend, -C, and -c.
31067 reflog gc: a tag that does not point at a commit is not a crime.
31068 git-checkout -m: fix merge case
31069 git-daemon documentation on enabling services.
31070 ls-remote and clone: accept --upload-pack=<path> as well.
31071 Refactor the pack header reading function out of receive-pack.c
31072 Allow fetch-pack to decide keeping the fetched pack without exploding
31073 fetch-pack: remove --keep-auto and make it the default.
31074 Consolidate {receive,fetch}.unpackLimit
31075 Allow non-developer to clone, checkout and fetch more easily.
31076 parse-remote: do not barf on a remote shorthand without any refs to fetch.
31077 show-branch -g: default to HEAD
31078 Documentation: pack-refs --all vs default behaviour
31079 Make sure we do not write bogus reflog entries.
31080 git-merge: leave sensible reflog message when used as the first level UI.
31081 create_symref: check error return from open().
31082 write_in_full: size_t is unsigned.
31083 Don't force everybody to call setup_ident().
31084 git-blame --porcelain: quote filename in c-style when needed.
31085 Update describe documentation.
31086 Document 'git-blame --incremental'
31087 git-fsck-objects is now synonym to git-fsck
31088 Two small typofixes.
31089 lock_any_ref_for_update(): do not accept malformatted refs.
31090 git-commit -s: no extra space when sign-offs appear at the end already.
31091 git-blame: somewhat better commenting.
31092 git-send-email: remove debugging output.
31094 Documentation: "git-checkout <tree> <path>" takes any tree-ish
31095 t9200: Re-code non-ascii path test in UTF-8
31096 t9200: do not test -x bit if the filesystem does not support it.
31097 git main documentation: point at the user's manual.
31098 Do not use hardcoded path to xhmtl.xsl to generate user's manual
31101 Linus Torvalds (5):
31102 fsck-objects: refactor checking for connectivity
31103 Fix seriously broken "git pack-refs"
31104 Add dangling objects tips.
31105 git-blame --incremental
31106 git-push through git protocol
31109 wt-status: Actually accept `color.status.BLAH' configuration variables.
31110 Documentation/config.txt: Fix documentation of colour config tweaks.
31111 Make fsck and fsck-objects be builtins.
31114 fix suggested branch creation command when detaching head
31115 git-log -g --pretty=oneline should display the reflog message
31116 tone down the detached head warning
31119 sha1_file.c: Avoid multiple calls to find_pack_entry().
31120 Documentation: --amend cannot be combined with -c/-C/-F.
31123 git-blame --incremental: don't use pager
31126 contrib/emacs/vc-git.el: support vc-version-other-window
31129 git-fetch: Allow fetching the remote HEAD
31131 Shawn O. Pearce (6):
31132 Remove unnecessary found variable from describe.
31133 Teach git-describe to display distances from tags.
31134 Compute accurate distances in git-describe before output.
31135 Teach for-each-ref about a little language called Tcl.
31136 Don't coredump on bad refs in update-server-info.
31137 Escape --upload-pack from expr.
31139 Simon 'corecode' Schubert (1):
31140 Replace perl code with pure shell code
31143 Rename git-repo-config to git-config.
31145 Uwe Kleine-König (2):
31146 rename --exec to --upload-pack for fetch-pack and peek-remote
31147 make --upload-pack option to git-fetch configurable
31150 Version v1.5.0-rc2; changes since v1.5.0-rc1:
31151 ---------------------------------------------
31154 git-revert: Fix die before git-sh-setup defines it.
31156 Chris Wedgwood (1):
31157 cache.h; fix a couple of prototypes
31160 Shell syntax fix in git-reset
31161 Document --ignore-if-in-upstream in git-format-patch
31164 gitk: add current directory to main window title
31167 git-svn: fix tests to work with older svn
31168 git-svn: print and flush authentication prompts to STDERR
31171 Start all test scripts with /bin/sh.
31172 Set _ALL_SOURCE for AIX, but avoid its struct list.
31173 Replace "echo -n" with printf in shell scripts.
31174 Solaris 5.8 returns ENOTDIR for inappropriate renames.
31177 git-pull: disallow implicit merging to detached HEAD
31179 Johannes Schindelin (9):
31180 Fix spurious compile error
31181 config_set_multivar(): disallow newlines in keys
31182 show_date(): fix relative dates
31183 apply --cached: fix crash in subdirectory
31184 Do not verify filenames in a bare repository
31185 Teach the revision walker to walk by reflogs with --walk-reflogs
31186 --walk-reflogs: disallow uninteresting commits
31187 --walk-reflogs: actually find the right commit by date.
31188 --walk-reflogs: do not crash with cyclic reflog ancestry
31190 Junio C Hamano (69):
31191 reflog-expire: brown paper bag fix.
31192 merge-recursive: do not report the resulting tree object name
31193 Explain "Not a git repository: '.git'".
31195 Make git-prune-packed a bit more chatty.
31196 Define cd_to_toplevel shell function in git-sh-setup
31197 Use cd_to_toplevel in scripts that implement it by hand.
31198 Allow whole-tree operations to be started from a subdirectory
31199 Use log output encoding in --pretty=email headers.
31200 t3901: test "format-patch | am" pipe with i18n
31201 git-commit documentation: -a adds and also removes
31202 Consistent message encoding while reusing log from an existing commit.
31203 More tests in t3901.
31204 git log documentation: teach -<n> form.
31206 Documentation: merge-output is not too verbose now.
31207 Use merge-recursive in git-revert/git-cherry-pick
31208 git reflog expire: document --stale-fix option.
31209 Fix git-fetch while on detached HEAD not to give needlessly alarming errors
31210 git-push documentation: remaining bits
31211 git-rm documentation: remove broken behaviour from the example.
31212 tutorial: shorthand for remotes but show distributed nature of git
31213 git-commit documentation: remove comment on unfixed git-rm
31214 Use merge-recursive in git-checkout -m (branch switching)
31215 Document where configuration files are in config.txt
31216 git-commit: document log message formatting convention
31217 Documentation/SubmittingPatches: Gnus tips
31218 Documentation/git-tag: the command can be used to also verify a tag.
31219 Documentation/git-tools.txt: mention tig and refer to wiki
31220 Documentation/git-tar-tree.txt: default umask is now 002
31221 Documentation/git-status.txt: mention color configuration
31222 Documentation/git-whatchanged.txt: show -<n> instead of --max-count.
31223 Documentation/git-sh-setup.txt: programmer's docs
31224 Documentation: detached HEAD
31225 Make a short-and-sweet "git-add -i" synonym for "git-add --interactive"
31226 Documentation: describe shallow repository
31227 Documentation/glossary.txt: unpacked objects are loose.
31228 Documentation/glossary.txt: describe remotes/ tracking and packed-refs
31229 Introduce 'git-format-patch --suffix=.patch'
31230 git-format-patch: do not crash with format.headers without value.
31231 Documentation/git-resolve: deprecated.
31232 Documentation: suggest corresponding Porcelain-level in plumbing docs.
31233 Documentation: m can be relative in "git-blame -Ln,m"
31234 Documentation/git-parse-remote.txt: we deal with config vars as well
31235 git-format-patch -3
31236 Add --summary to git-format-patch by default
31237 git-format-patch: make --binary on by default
31238 git-format-patch: the default suffix is now .patch, not .txt
31239 Use fixed-size integers for .idx file I/O
31240 Documentation: move command list in git.txt into separate files.
31241 Documentation: sync git.txt command list and manual page title
31242 Documentation: Generate command lists.
31243 for_each_reflog_ent: do not leak FILE *
31244 refs.c::read_ref_at(): fix bogus munmap() call.
31245 Documentation: generated cmds-*.txt does not depend on git.txt
31246 Documentation/git.txt: command re-classification
31247 dwim_ref(): Separate name-to-ref DWIM code out.
31248 Extend read_ref_at() to be usable from places other than sha1_name.
31249 show-branch --reflog: show the reflog message at the top.
31250 show-branch --reflog: tighten input validation.
31251 show-branch --reflog: fix show_date() call
31252 Stop ignoring Documentation/README
31253 git-tag -d: allow deleting multiple tags at once.
31254 branch -f: no reason to forbid updating the current branch in a bare repo.
31255 git-rebase: allow rebasing a detached HEAD.
31256 log --walk-reflog: documentation
31257 reflog-walk: build fixes
31258 Fix --walk-reflog with --pretty=oneline
31261 Linus Torvalds (2):
31262 Clean up write_in_full() users
31263 Fix up totally buggered read_or_die()
31265 Matthias Lederhofer (2):
31266 prune-packed: add -q to usage
31267 prune: --grace=time
31269 Michael S. Tsirkin (1):
31270 fix documentation for git-commit --no-verify
31273 use 'init' instead of 'init-db' for shipped docs and tools
31274 simplify the "no changes added to commit" message
31276 sanitize content of README file
31279 Make gitk work when launched in a subdirectory
31282 git-remote: no longer silent on unknown commands.
31285 Documentation: a few spelling fixes
31288 tutorial: Use only separate layout
31290 Shawn O. Pearce (18):
31291 Improve merge performance by avoiding in-index merges.
31292 Hide output about SVN::Core not being found during tests.
31293 Remove read_or_die in favor of better error messages.
31294 Remove unnecessary call_depth parameter in merge-recursive.
31295 Allow the user to control the verbosity of merge-recursive.
31296 Enable output buffering in merge-recursive.
31297 Display a progress meter during merge-recursive.
31298 Convert output messages in merge-recursive to past tense.
31299 Always perfer annotated tags in git-describe.
31300 Hash tags by commit SHA1 in git-describe.
31301 Use binary searching on large buckets in git-describe.
31302 Improve git-describe performance by reducing revision listing.
31303 Correct priority of lightweight tags in git-describe.
31304 Remove hash in git-describe in favor of util slot.
31305 Use nice names in conflict markers during cherry-pick/revert.
31306 Document the master@{n} reflog query syntax.
31307 Refer users to git-rev-parse for revision specification syntax.
31308 Document pack .idx file format upgrade strategy.
31310 Simon 'corecode' Schubert (2):
31311 Use fixed-size integers for the on-disk pack structure.
31312 Use standard -t option for touch.
31314 Uwe Kleine-König (4):
31315 document --exec for git-push
31316 Update documentation of fetch-pack, push and send-pack
31317 make --exec=... option to git-push configurable
31318 rename --exec to --receive-pack for push and send-pack
31321 Version v1.5.0-rc1; changes since v1.5.0-rc0:
31322 ---------------------------------------------
31325 Speed-up recursive by flushing index only once for all entries
31327 Alexandre Julliard (12):
31328 Shallow clone: do not ignore shallowness when following tags
31329 fetch-pack: Properly remove the shallow file when it becomes empty.
31330 upload-pack: Check for NOT_SHALLOW flag before sending a shallow to the client.
31331 git-fetch: Reset shallow_depth before auto-following tags.
31332 get_shallow_commits: Avoid memory leak if a commit has been reached already.
31333 fetch-pack: Do not fetch tags for shallow clones.
31334 git-clean: Fix the -q option.
31335 git.el: Don't use --info-only when resolving a file.
31336 git.el: Avoid setting font lock keywords before entering log-edit mode.
31337 git-apply: Remove directories that have become empty after deleting a file.
31338 git-clone: Make sure the master branch exists before running cat on it.
31339 git.el: Define the propertize function if needed, for XEmacs compatibility.
31342 hooks/commit-msg: add example to add Signed-off-by line to message
31344 Andy Whitcroft (6):
31345 send pack check for failure to send revisions list
31346 ssh-upload: prevent buffer overrun
31347 short i/o: clean up the naming for the write_{in,or}_xxx family
31348 short i/o: fix calls to read to use xread or read_in_full
31349 short i/o: fix calls to write to use xwrite or write_in_full
31350 short i/o: fix config updates to use write_in_full
31352 Brian Gernhardt (3):
31353 Add documentation for git-branch's color configuration.
31354 Ignore git-init and git-remote
31355 Auto-quote config values in config.c:store_write_pair()
31358 git-svn: quiet down tests and fix some unportable shell constructs
31359 git-svn: dcommit should diff against the current HEAD after committing
31360 t6024-recursive-merge: quiet down this test
31361 test-lib: quiet down init-db output for tests
31362 t9200-git-cvsexportcommit.sh: quiet down commit
31363 git-svn: remove non-delta fetch code paths
31364 git-svn: print out the SVN library version in --version, too
31365 git-svn: verify_ref() should actually --verify
31366 git-svn: sort multi-init output
31367 git-svn: remove svnadmin dependency from the tests
31368 git-svn: t/t9100-git-svn-basic: remove old check for NO_SYMLINK
31369 git-svn: t/t91??-*: optimize the tests a bit
31370 instaweb: load Apache mime and dir modules if they are needed
31371 git-svn: make multi-init less confusing
31372 git-svn: update documentation for multi-{init|fetch}
31373 git-svn: make --repack work consistently between fetch and multi-fetch
31374 Documentation/git-svn: clarify dcommit, rebase vs pull/merge
31375 git-svn: fix show-ignore
31376 git-svn: add --prefix= option to multi-init
31377 git-svn: pass an unambiguous ref to rev-list when grafting-branches
31378 Avoid errors and warnings when attempting to do I/O on zero bytes
31380 Fredrik Kuivinen (1):
31381 instaweb: Nicer error message when the http daemon isn't found
31383 J. Bruce Fields (9):
31384 Docs: update cvs-migration.txt to reflect clone's new default behavior
31385 Documentation: update git-clone.txt for clone's new default behavior
31386 Documentation: update glossary entry for "origin"
31387 Documentation: update tutorial's discussion of origin
31388 Documentation: update git-pull.txt for new clone behavior
31389 Documentation: remove master:origin example from pull-fetch-param.txt
31390 Documentation: tutorial editing
31391 Documentation: clarify definition of "reachable"
31392 Documentation: add git-remote man page
31394 Jakub Narębski (14):
31395 gitweb: Add mod_perl version string to "generator" meta header
31396 gitweb: Precompile CGI routines for mod_perl
31397 Add info about new test families (8 and 9) to t/README
31398 gitweb: Fix error in git_project_index subroutine
31399 gitweb: Fix bug in git_difftree_body (was '!=' instead of 'ne')
31400 gitweb: There can be empty patches (in git_patchset_body)
31401 gitweb: Fix "Use of uninitialized value" warning in git_tags_body
31402 gitweb: Fix error in git_patchest_body for file creation/deletion patch
31403 gitweb: Fix error in "rename to"/"copy to" git diff header output
31404 gitweb: Fix errors in git_patchset_body for empty patches
31405 Revert "gitweb: There can be empty patches (in git_patchset_body)"
31406 gitweb: Fix split patches output (e.g. file to symlink)
31407 gitweb: Remove superfluous "|" in "commit" view
31408 gitweb: Fix git_patchset_body not closing <div class="patch">
31411 get_tree_entry: map blank requested entry to tree root
31414 update hook: redirect _both_ diagnostic lines to stderr upon tag failure
31416 Johannes Schindelin (9):
31417 upload-pack: no longer call rev-list
31418 support fetching into a shallow repository
31419 allow cloning a repository "shallowly"
31420 allow deepening of a shallow repository
31421 add tests for shallow stuff
31422 xdl_merge(): fix a segmentation fault when refining conflicts
31423 Fix yet another subtle xdl_merge() bug
31424 Sanitize for_each_reflog_ent()
31425 Fix t1410 for core.filemode==false
31427 Junio C Hamano (106):
31428 We should make sure that the protocol is still extensible.
31429 Why does it mean we do not have to register shallow if we have one?
31430 Why didn't we mark want_obj as ~UNINTERESTING in the old code?
31431 shallow clone: unparse and reparse an unshallowed commit
31432 add for_each_reflog_ent() iterator
31433 Protect commits recorded in reflog from pruning.
31434 Teach git-repack to preserve objects referred to by reflog entries.
31435 reflog: fix warning message.
31436 Move in_merge_bases() to commit.c
31438 reflog expire: prune commits that are not incomplete
31439 reflog expire: do not punt on tags that point at non commits.
31440 show-branch --reflog: add documentation.
31441 Document --numstat in git-apply and git-diff
31442 Document git-reset <commit> -- <paths>...
31443 Move encoding conversion routine out of mailinfo to utf8.c
31444 i18n.logToUTF8: convert commit log message to UTF-8
31445 Teach log family --encoding
31446 everyday: update for v1.5.0
31447 count-objects -v: show number of packs as well.
31448 rerere gc: honor configuration and document it
31449 git-reflog: gc.* configuration and documentation.
31450 everyday: replace a few 'prune' and 'repack' with 'gc'
31451 Use 'repack -a -d -l' instead of 'repack -a -d' in git-gc
31452 Set NO_MMAP for Cygwin by default
31453 UTF-8: introduce i18n.logoutputencoding.
31454 gcc does not necessarily pass runtime libpath with -R
31455 Work around http-fetch built with cURL 7.16.0
31456 Rename t3900 test vector file
31457 t3900: test conversion to non UTF-8 as well
31458 GIT_SKIP_TESTS: allow users to omit tests that are known to break
31459 core.logallrefupdates: log remotes/ tracking branches.
31460 Allow non-fast-forward of remote tracking branches in default clone
31461 t5400 send-pack test: try a bit more nontrivial transfer.
31462 Revert "read_directory: show_both option."
31463 Fix 'git add' with .gitignore
31464 pack-objects: fix use of use_pack().
31465 mmap: set FD_CLOEXEC for file descriptors we keep open for mmap()
31466 send-pack: fix pipeline.
31467 Documentation: illustrate send-pack pipeline.
31468 commit re-encoding: fix confusion between no and default conversion.
31469 t3900: test log --encoding=none
31470 Documentation: i18n commit log message notes.
31471 Documentation: minor rewording for git-log and git-show pages.
31472 Move commit reencoding parameter parsing to revision.c
31473 commit-tree: cope with different ways "utf-8" can be spelled.
31474 i18n: drop "encoding" header in the output after re-coding.
31475 Documentation/config.txt (and repo-config manpage): mark-up fix.
31476 Update documentation for update hook.
31477 send-pack.c: use is_null_sha1()
31478 send-pack: tell pack-objects to use its internal rev-list.
31479 Do not merge random set of refs out of wildcarded refs
31480 i18n: do not leak 'encoding' header even when we cheat the conversion.
31481 Update send-pack pipeline documentation.
31482 fail pull/merge early in the middle of conflicted merge
31483 git-fetch: remove .keep file at the end.
31484 Strongly discourage --update-head-ok in fetch-options documentation.
31485 Update clone/fetch documentation with --depth (shallow clone) option
31486 Remove unused variable (git-commit.sh)
31487 fetch-pack: do not use lockfile structure on stack.
31488 Fix infinite loop when deleting multiple packed refs.
31489 tutorial: misc updates.
31490 git-verify-tag: make sure we remove temporary file.
31491 pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
31492 rerere: Fix removal of already resolved path.
31494 builtin-prune: memory diet.
31495 Fix timestamp for test-tick
31496 builtin-prune: make file-scope static struct to an argument.
31497 builtin-prune: separate ref walking from reflog walking.
31498 Move traversal of reachable objects into a separate library.
31499 reflog expire --fix-stale
31500 reflog --fix-stale: do not check the same trees and commits repeatedly.
31501 diff-index --cached --raw: show tree entry on the LHS for unmerged entries.
31502 git-reset <tree> -- <path> restores absense of <path> in <tree>
31503 Spell default packedgitlimit slightly differently
31504 Move initialization of log_all_ref_updates
31505 Introduce is_bare_repository() and core.bare configuration variable
31506 git-fetch: allow updating the current branch in a bare repository.
31507 git-status: show detached HEAD
31508 Detached HEAD (experimental)
31509 git-checkout: do not warn detaching HEAD when it is already detached.
31510 git-checkout: rewording comments regarding detached HEAD.
31511 git-checkout: safety when coming back from the detached HEAD state.
31512 git-checkout: fix branch name output from the command
31513 --utf8 is now default for 'git-am'
31514 --prune is now default for 'pack-refs'
31515 rm git-rerere.perl -- it is now a built-in.
31516 merge-base: do not leak commit list
31517 Do not ignore a detected patchfile brokenness.
31518 Fix "Do not ignore a detected patchfile brokenness."
31519 builtin-archive: do not free a tree held by the object layer.
31520 git-checkout: safety check for detached HEAD checks existing refs
31521 git-checkout: handle local changes sanely when detaching HEAD
31522 git-am: should work when "--no-utf8 --utf8" is given
31523 -u is now default for 'git-applymbox'
31524 -u is now default for 'git-mailinfo'.
31525 Makefile: remove $foo when $foo.exe is built/installed.
31526 merge-recursive: do not use on-file index when not needed.
31528 index-pack: write-or-die instead of unchecked write-in-full.
31529 config-set: check write-in-full returns in set_multivar
31530 git-rm: do not fail on already removed file.
31531 git-status: wording update to deal with deleted files.
31532 plug a few leaks in revision walking used in describe.
31536 Clarify syntax and role of git-add in status output
31537 Improve "nothing to commit" part of status output
31538 Support --amend on initial commit in status output
31539 Improve cached content header of status output
31540 Remove unnecessary git-rm --cached reference from status output
31541 send-email: work around double encoding of in-body From field.
31542 Provide better feedback for the untracked only case in status output
31545 Skip excessive blank lines before commit body
31546 Refactor print-functions in builtin-branch
31547 git-branch: show detached HEAD
31549 Linus Torvalds (3):
31550 write-cache: do not leak the serialized cache-tree data.
31551 write_in_full: really write in full or return error on disk full.
31552 Better error messages for corrupt databases
31555 Blame "linenr" link jumps to previous state at "orig_lineno"
31557 Martin Langhoff (6):
31558 cvsimport: skip commits that are too recent
31559 cvsimport: skip commits that are too recent (option and documentation)
31560 cvsimport: document -S and -L options
31561 cvsimport: cleanup temporary cvsps file
31562 cvsserver: detect early of we are up to date and avoid costly rev-list
31563 cvsserver: fix revision number during file adds
31565 Michael Loeffler (1):
31566 git-commit: do not fail to print the diffstat even if there is a file named HEAD
31569 add .mailmap for git-shortlog output with the git repository
31570 Add git-reflog to .gitignore
31571 move git-blame to its place in .gitignore
31572 "init-db" can really be just "init"
31573 Add git-init documentation.
31576 Fix warnings in sha1_file.c - use C99 printf format if available
31579 git-send-email: default value for "From:" field.
31582 Make check target depend on common-cmds.h
31583 Remove shadowing variable from traverse_trees()
31584 Set default "tar" umask to 002 and owner.group to root.root
31586 Robert Fitzsimons (2):
31587 gitweb: Re-enable rev-list --parents for parse_commit.
31588 gitweb: Fix shortlog only showing HEAD revision.
31591 Documentation/tutorial: misc updates
31592 git-tag: add flag to verify a tag
31594 Sasha Khapyorsky (3):
31595 git-svnimport: support for incremental import
31596 git-svnimport: clean svn path when accessing SVN repo
31597 git-svnimport: fix edge revisions double importing
31599 Shawn O. Pearce (49):
31600 Don't crash during repack of a reflog with pruned commits.
31601 Create 'git gc' to perform common maintenance operations.
31602 Use GIT_REFLOG_ACTION environment variable instead.
31603 Honor GIT_REFLOG_ACTION in git-rebase.
31604 Use branch names in 'git-rebase -m' conflict hunks.
31605 Ensure `git-pull` fails if `git-merge` fails.
31606 Honor pull.{twohead,octopus} in git-merge.
31607 Allow git-merge to select the default strategy.
31608 Move better_branch_name above get_ref in merge-recursive.
31609 Allow merging bare trees in merge-recursive.
31610 Use merge-recursive in git-am -3.
31611 Replace unpack_entry_gently with unpack_entry.
31612 Introduce new config option for mmap limit.
31613 Refactor packed_git to prepare for sliding mmap windows.
31614 Use off_t for index and pack file lengths.
31615 Create read_or_die utility routine.
31616 Refactor how we open pack files to prepare for multiple windows.
31617 Replace use_packed_git with window cursors.
31618 Loop over pack_windows when inflating/accessing data.
31619 Document why header parsing won't exceed a window.
31620 Unmap individual windows rather than entire files.
31621 Fully activate the sliding window pack access.
31622 Load core configuration in git-verify-pack.
31623 Ensure core.packedGitWindowSize cannot be less than 2 pages.
31624 Improve error message when packfile mmap fails.
31625 Support unmapping windows on 'temporary' packfiles.
31626 Create pack_report() as a debugging aid.
31627 Test suite for sliding window mmap implementation.
31628 Default core.packdGitWindowSize to 1 MiB if NO_MMAP.
31629 Release pack windows before reporting out of memory.
31630 Replace mmap with xmmap, better handling MAP_FAILED.
31631 Cleanup read_cache_from error handling.
31632 Fix random segfaults in pack-objects.
31633 Force core.filemode to false on Cygwin.
31634 Use PATH_MAX constant for --bare.
31635 Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT.
31636 Automatically detect a bare git repository.
31637 Remove unnecessary argc parameter from run_command_v.
31638 Redirect update hook stdout to stderr.
31639 Use /dev/null for update hook stdin.
31640 Teach Git how to parse standard power of 2 suffixes.
31641 Update packedGit config option documentation.
31642 Add test case for update hooks in receive-pack.
31643 Increase packedGit{Limit,WindowSize} on 64 bit systems.
31644 Don't die in git-http-fetch when fetching packs.
31645 Don't save the commit buffer in git-describe.
31646 Make git-describe a builtin.
31647 Disallow working directory commands in a bare repository.
31648 Chose better tag names in git-describe after merges.
31650 Stefan-W. Hahn (1):
31651 Replacing the system call pread() with lseek()/xread()/lseek() sequence.
31654 Describe git-clone's actual behavior in the summary
31655 Print a more accurate error message when we fail to create a lock file.
31656 Update git-svn manpage to remove the implication that SVN::* is optional.
31659 Fix formatting for urls section of fetch, pull, and push manpages
31660 Fix formatting for urls section of fetch, pull, and push manpages
31663 Version v1.5.0-rc0; changes since v1.4.4.4:
31664 -------------------------------------------
31667 Make perl/ build procedure ActiveState friendly.
31669 Alexandre Julliard (1):
31670 vc-git: Ignore errors caused by a non-existent directory in vc-git-registered.
31672 Andreas Ericsson (2):
31673 ls-files: Give hints when errors happen.
31674 git-diff: Introduce --index and deprecate --cached.
31677 Improve git-prune -n output
31678 Add support to git-branch to show local and remote branches
31679 Use .git/config for storing "origin" shortcut repository
31680 De-emphasise the symbolic link documentation.
31681 Explicitly add the default "git pull" behaviour to .git/config on clone
31682 Colourise git-branch output
31683 Allow subcommand.color and color.subcommand color configuration
31684 git-status always says what branch it's on
31686 Aneesh Kumar K.V (1):
31687 Add config example with respect to branch
31689 Brian Gernhardt (6):
31690 Add --add option to git-repo-config
31691 Make git-diff documentation use [--] when it should.
31692 Add documentation for show-branch --topics
31693 Remove COLLISION_CHECK from Makefile since it's not used.
31694 Keep "git --git-dir" from causing a bus error.
31695 Make git-show-branch options similar to git-branch.
31697 David S. Miller (1):
31698 Pass -M to diff in request-pull
31701 git-svn: handle authentication without relying on cached tokens on disk
31702 git-svn: correctly access repos when only given partial read permissions
31703 git-svn: exit with status 1 for test failures
31704 git-svn: allow SVN:: lib users to track the root of the repository (again)
31705 git-svn: use ~/.subversion config files when using SVN:: libraries
31706 git-svn: enable delta transfers during fetches when using SVN:: libs
31707 git-svn: update tests for recent changes
31708 git-svn: error out when the SVN connection fails during a fetch
31709 git-svn: fix output reporting from the delta fetcher
31710 git-svn: color support for the log command
31711 git-svn: documentation updates
31712 git-svn: fix multi-init
31713 git-svn: avoid network timeouts for long-running fetches
31714 git-svn: extra error check to ensure we open a file correctly
31715 git-svn: use do_switch for --follow-parent if the SVN library supports it
31716 rerere: add clear, diff, and status commands
31717 rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
31718 git-svn: enable logging of information not supported by git
31719 git-svn: allow dcommit to take an alternate head
31720 git-svn: correctly display fatal() error messages
31721 git-svn: correctly handle packed-refs in refs/remotes/
31722 git-svn: correctly handle "(no author)" when using an authors file
31723 git-svn: convert to using Git.pm
31724 git-svn: remove support for the svn command-line client
31725 git-svn: rename 'commit' command to 'set-tree'
31726 git-cvsserver: fix breakage when calling git merge-file
31727 Remove NO_ACCURATE_DIFF options from build systems
31728 git-svn: enable common fetch/commit options for dcommit
31729 Makefile: add quick-install-doc for installing pre-built manpages
31731 Han-Wen Nienhuys (2):
31732 git-tag: allow empty tag message if -m is given explicitly.
31733 ident.c: Trim hint printed when gecos is empty.
31736 git-cvsimport: add support for CVS pserver method HTTP/1.x proxying
31738 J. Bruce Fields (5):
31739 Documentation: clarify tutorial pull/merge discussion
31740 cvs-migration: improved section titles, better push/commit explanation
31741 Documentation: reorganize cvs-migration.txt
31742 Documentation: update git-clone man page with new behavior
31743 Documentation: simpler shared repository creation
31745 Jakub Narębski (26):
31746 gitweb: Protect against possible warning in git_commitdiff
31747 gitweb: Buffer diff header to deal with split patches + git_patchset_body refactoring
31748 gitweb: Default to $hash_base or HEAD for $hash in "commit" and "commitdiff"
31749 gitweb: New improved formatting of chunk header in diff
31750 gitweb: Add an option to href() to return full URL
31751 gitweb: Refactor feed generation, make output prettier, add Atom feed
31752 gitweb: Finish restoring "blob" links in git_difftree_body
31753 gitweb: Replace SPC with also in tag comment
31754 gitweb: Do not use esc_html in esc_path
31755 gitweb: Use git-show-ref instead of git-peek-remote
31756 gitweb: Add author and committer email extraction to parse_commit
31757 gitweb: Add author and contributor email to Atom feed
31758 gitweb: Use author_epoch for pubdate in gitweb feeds
31759 gitweb: Make project description in projects list link to summary view
31760 gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url
31761 git-clone: Rename --use-immingled-remote option to --no-separate-remote
31762 Document git-diff whitespace flags -b and -w
31763 gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" view
31764 gitweb: Don't use Content-Encoding: header in git_snapshot
31765 gitweb: Show target of symbolic link in "tree" view
31766 gitweb: Add generic git_object subroutine to display object of any type
31767 gitweb: Hyperlink target of symbolic link in "tree" view (if possible)
31768 gitweb: SHA-1 in commit log message links to "object" view
31769 gitweb: Do not show difftree for merges in "commit" view
31770 gitweb: Add title attribute to ref marker with full ref name
31771 gitweb: Add "next" link to commit view
31774 shortlog: fix segfault on empty authorname
31775 vim syntax: follow recent changes to commit template
31778 Set permissions of each new file before "cvs add"ing it.
31780 Johannes Schindelin (30):
31782 shortlog: do not crash on parsing "[PATCH"
31783 shortlog: read mailmap from ./.mailmap again
31784 shortlog: handle email addresses case-insensitively
31786 shortlog: use pager
31787 sha1_object_info(): be consistent with read_sha1_file()
31788 xdiff: add xdl_merge()
31789 xdl_merge(): fix an off-by-one bug
31790 xdl_merge(): fix thinko
31791 diff -b: ignore whitespace at end of line
31792 xdl_merge(): fix and simplify conflict handling
31793 cvs-migration document: make the need for "push" more obvious
31794 Add builtin merge-file, a minimal replacement for RCS merge
31795 merge-file: support -p and -q; fix compile warnings
31796 Get rid of the dependency on RCS' merge program
31797 merge-recursive: add/add really is modify/modify with an empty base
31798 INSTALL: no need to have GNU diff installed
31799 git-show: grok blobs, trees and tags, too
31800 Document git-merge-file
31801 add a function to rename sections in the config
31802 git-branch: rename config vars branch.<branch>.*, too
31803 Introduce GIT_TEMPLATE_DIR
31804 Use git-merge-file in git-merge-one-file, too
31805 git-tag: support -F <file> option
31806 git-reset --hard: tell the user what the HEAD was reset to
31807 move read_mmfile() into xdiff-interface
31808 Add a test for git-rerere
31809 Make git-rerere a builtin
31810 commit-tree: encourage UTF-8 commit messages.
31812 Josef Weidendorfer (2):
31813 Add branch.*.merge warning and documentation update
31814 Move "no merge candidate" warning into git-pull
31816 Junio C Hamano (115):
31817 upload-pack: stop the other side when they have more roots than we do.
31818 apply --numstat: mark binary diffstat with - -, not 0 0
31819 pack-objects: tweak "do not even attempt delta" heuristics
31820 Store peeled refs in packed-refs file.
31821 remove merge-recursive-old
31822 git-merge: make it usable as the first class UI
31823 merge: allow merging into a yet-to-be-born branch.
31824 Store peeled refs in packed-refs (take 2).
31825 git-fetch: reuse ls-remote result.
31826 git-fetch: fix dumb protocol transport to fetch from pack-pruned ref
31827 git-fetch: allow glob pattern in refspec
31828 refs outside refs/{heads,tags} match less strongly.
31829 Typefix builtin-prune.c::prune_object()
31830 Allow git push to delete remote ref.
31831 gitweb: (style) use chomp without parentheses consistently.
31832 git-clone: stop dumb protocol from copying refs outside heads/ and tags/.
31833 git-branch -D: make it work even when on a yet-to-be-born branch
31834 git-shortlog: fix common repository prefix abbreviation.
31835 git-shortlog: make common repository prefix configurable with .mailmap
31836 git-commit: show --summary after successful commit.
31837 git-fetch: exit with non-zero status when fast-forward check fails
31838 git-fetch: allow forcing glob pattern in refspec
31839 fetch-pack: do not barf when duplicate re patterns are given
31840 grep: do not skip unmerged entries when grepping in the working tree.
31841 git-merge: tighten error checking.
31842 git-merge: do not leak rev-parse output used for checking internally.
31843 cvsimport: style fixup.
31844 git-merge: fix confusion between tag and branch
31845 xmerge: make return value from xdl_merge() more usable.
31846 merge-recursive: use xdl_merge().
31847 read-tree: further loosen "working file will be lost" check.
31848 Loosen "working file will be lost" check in Porcelain-ish
31849 read-tree: document --exclude-per-directory
31850 git-merge: squelch needless error message.
31851 git-merge: fix "fix confusion between tag and branch" for real
31853 git-rerere: add 'gc' command.
31854 Documentation/git-commit: rewrite to make it more end-user friendly.
31855 git-commit: allow --only to lose what was staged earlier.
31856 shortlog: remove "[PATCH]" prefix from shortlog output
31857 shortlog: fix segfault on empty authorname
31858 diff --numstat: show binary with '-' to match "apply --numstat"
31859 add test case for recursive merge
31860 git-push: document removal of remote ref with :<dst> pathspec
31861 Revert "git-diff: Introduce --index and deprecate --cached."
31862 git merge: reword failure message.
31863 spurious .sp in manpages
31864 git-push: accept tag <tag> as advertised.
31865 send-pack: tighten checks for remote names
31866 branch --color: change default color selection.
31867 git-blame: show lines attributed to boundary commits differently.
31868 config documentation: group color items together.
31869 git-svn: allow both diff.color and color.diff
31870 Update git-diff documentation
31871 git-fetch: make it work from within a subdirectory.
31872 git-reset: make it work from within a subdirectory.
31873 git-reset [--mixed] <tree> [--] <paths>...
31874 merge: give a bit prettier merge message to "merge branch~$n"
31875 git-clone: use wildcard specification for tracking branches
31876 git-pull: refuse default merge without branch.*.merge
31877 git-clone: lose the artificial "first" fetch refspec
31878 git-clone: lose the traditional 'no-separate-remote' layout
31879 update-index: make D/F conflict error a bit more verbose.
31880 git-add: remove conflicting entry when adding.
31881 Fix check_file_directory_conflict().
31882 Fix mis-mark-up in git-merge-file.txt documentation
31883 markup fix in svnimport documentation.
31884 rev-list --left-right
31885 Teach all of log family --left-right output.
31886 Make left-right automatic.
31887 Teach show-branch how to show ref-log data.
31888 git-fetch: Avoid reading packed refs over and over again
31889 avoid accessing _all_ loose refs in git-show-ref --verify
31890 show-ref: fix --quiet --verify
31891 show-ref: fix --verify --hash=length
31892 parse-remote::expand_refs_wildcard()
31893 show-ref: fix --exclude-existing
31894 racy-git: documentation updates.
31895 rerere: fix breakage of resolving.
31896 fix testsuite: make sure they use templates freshly built from the source
31897 Teach git-branch to delete tracking branches with -r -d
31898 blame: -b (blame.blankboundary) and --root (blame.showroot)
31899 git-add --interactive
31900 git-add --interactive: hunk splitting
31901 Revert "fix testsuite: make sure they use templates freshly built from the source"
31902 Do not create $GIT_DIR/remotes/ directory anymore.
31903 Use preprocessor constants for environment variable names.
31904 Revert "Make left-right automatic."
31905 fix populate-filespec
31906 config_rename_section: fix FILE* leak
31907 simplify inclusion of system header files.
31908 revision: --skip=<n>
31909 git-add: error out when given no arguments.
31910 compat/inet_ntop: do not use u_int
31911 diff documentation: mostly talk about <commit>
31912 Revert "git-pull: refuse default merge without branch.*.merge"
31913 parse-remote: mark all refs not for merge only when fetching more than one
31914 _XOPEN_SOURCE problem also exists on FreeBSD
31915 commit-tree: do not overflow MAXPARENT
31916 merge and reset: adjust for "reset --hard" messages
31917 default pull: forget about "newbie protection" for now.
31918 Do not support "partial URL shorthand" anymore.
31919 Really fix headers for __FreeBSD__
31920 git-tag: lose exit after die
31921 Allow branch.*.merge to talk about remote tracking branches.
31922 git-add --interactive: add documentation
31923 match_pathspec() -- return how well the spec matched
31924 git-rm: update to saner semantics
31925 t3600: update the test for updated git rm
31926 git-rm: Documentation
31927 read_directory: show_both option.
31928 git-add: add ignored files when asked explicitly.
31929 git-add: warn when adding an ignored file with an explicit request.
31930 git-add -f: allow adding otherwise ignored files.
31934 Add -v and --abbrev options to git-branch
31935 git-branch: add options and tests for branch renaming
31936 rename_ref: use lstat(2) when testing for symlink
31937 git-branch: let caller specify logmsg
31942 Michael Loeffler (1):
31943 git-fetch: ignore dereferenced tags in expand_refs_wildcard
31945 Nicolas Pitre (11):
31946 builtin git-shortlog is broken
31947 pack-objects: remove redundent status information
31948 make 'git add' a first class user friendly interface to the index
31949 change the unpack limit treshold to a saner value
31950 repacked packs should be read-only
31951 make commit message a little more consistent and conforting
31952 make patch_delta() error cases a bit more verbose
31953 make git a bit less cryptic on fetch errors
31954 index-pack usage of mmap() is unacceptably slower on many OSes other than Linux
31955 clarify some error messages wrt unknown object types
31956 checkout: make the message about the need for a new branch a bit clearer
31958 Paul Mackerras (1):
31959 gitk: Fix enabling/disabling of menu items on Mac OS X
31962 config option log.showroot to show the diff of root commits
31965 Make git-clone --use-separate-remote the default
31968 git-clone documentation
31969 Documentation: new option -P for git-svnimport
31970 git-branch -d: do not stop at the first failure.
31971 Documentation/git-branch: new -r to delete remote-tracking branches.
31974 shortlog: remove range check
31976 Robert Fitzsimons (17):
31977 gitweb: Show '...' links in "summary" view only if there are more items
31978 gitweb: Add missing show '...' links change.
31979 gitweb: optimize git_get_last_activity.
31980 gitweb: optimize git_shortlog_body.
31981 gitweb: optimize git_summary.
31982 gitweb: Use rev-list pattern search options.
31983 gitweb: Require a minimum of two character for the search text.
31984 gitweb: Allow search to be disabled from the config file.
31985 gitweb: Paginate commit/author/committer search output
31986 gitweb: Add parse_commits, used to bulk load commit objects.
31987 gitweb: We do longer need the --parents flag in rev-list.
31988 gitweb: Change summary, shortlog actions to use parse_commits.
31989 gitweb: Change log action to use parse_commits.
31990 gitweb: Change header search action to use parse_commits.
31991 gitweb: Change atom, rss actions to use parse_commits.
31992 gitweb: Change history action to use parse_commits.
31993 gitweb: Use rev-list --skip option.
31995 Robin Rosenberg (1):
31996 Make cvsexportcommit work with filenames with spaces and non-ascii characters.
31998 Sean Estabrooks (1):
31999 Update documentation to remove incorrect GIT_DIFF_OPTS example.
32001 Shawn O. Pearce (30):
32002 Teach git-completion.bash how to complete git-merge.
32003 Hide plumbing/transport commands from bash completion.
32004 Teach bash how to complete options for git-name-rev.
32005 Add current branch in PS1 support to git-completion.bash.
32006 Teach bash how to complete git-format-patch.
32007 Teach bash how to complete git-cherry-pick.
32008 Teach bash how to complete git-rebase.
32009 Teach bash about git log/show/whatchanged options.
32010 Support bash completion of refs/remote.
32011 Teach bash about git-repo-config.
32012 Support --strategy=x completion in addition to --strategy x.
32013 Cache the list of merge strategies and available commands during load.
32014 Teach bash about git-am/git-apply and their whitespace options.
32015 Teach bash how to complete long options for git-commit.
32016 Fix broken bash completion of local refs.
32017 Remove uncontested renamed files during merge.
32018 Avoid accessing a slow working copy during diffcore operations.
32019 Provide more meaningful output from 'git init-db'.
32020 Enable reflogs by default in any repository with a working directory.
32021 Teach bash the new features of 'git show'.
32022 Suggest use of "git add file1 file2" when there is nothing to commit.
32023 Align section headers of 'git status' to new 'git add'.
32024 Default GIT_COMMITTER_NAME to login name in recieve-pack.
32025 Suggest 'add' in am/revert/cherry-pick.
32026 Rename imap-send's internal info/warn functions.
32027 Introduce a global level warn() function.
32028 Use extended SHA1 syntax in merge-recursive conflicts.
32029 Display 'theirs' branch name when possible in merge.
32030 Rename gitfakemmap to git_mmap.
32031 Switch git_mmap to use pread.
32033 Terje Sten Bjerkseth (1):
32034 Fix system header problems on Mac OS X
32036 Uwe Kleine-König (1):
32037 Fix documentation copy&paste typo
32040 Version v1.4.4.4; changes since v1.4.4.3:
32041 -----------------------------------------
32043 Johannes Schindelin (1):
32044 diff --check: fix off by one error
32046 Junio C Hamano (3):
32047 spurious .sp in manpages
32048 Fix infinite loop when deleting multiple packed refs.
32049 pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
32052 Version v1.4.4.3; changes since v1.4.4.2:
32053 -----------------------------------------
32056 Clarify fetch error for missing objects.
32058 Brian Gernhardt (1):
32059 Move Fink and Ports check to after config file
32062 no need to install manpages as executable
32065 git-svn: exit with status 1 for test failures
32066 git-svn: correctly display fatal() error messages
32069 Don't use memcpy when source and dest. buffers may overlap
32071 Junio C Hamano (1):
32074 Martin Langhoff (1):
32075 cvsserver: Avoid miscounting bytes in Perl v5.8.x
32077 Shawn O. Pearce (2):
32078 Make sure the empty tree exists when needed in merge-recursive.
32079 Bypass expensive content comparsion during rename detection.
32082 Version v1.4.4.2; changes since v1.4.4.1:
32083 -----------------------------------------
32086 git-blame: fix rev parameter handling.
32089 Increase length of function name buffer
32090 Document git-repo-config --bool/--int options.
32093 git-svn: error out from dcommit on a parent-less commit
32094 git-svn: correctly handle revision 0 in SVN repositories
32095 git-svn: preserve uncommitted changes after dcommit
32096 git-svn: avoid fetching files twice in the same revision
32098 Johannes Schindelin (1):
32099 git-mv: search more precisely for source directory in index
32101 Junio C Hamano (5):
32102 git blame -C: fix output format tweaks when crossing file boundary.
32103 tutorial: talk about user.name early and don't start with commit -a
32104 receive-pack: do not insist on fast-forward outside refs/heads/
32105 unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
32106 git-reset to remove "$GIT_DIR/MERGE_MSG"
32109 archive-zip: don't use sizeof(struct ...)
32112 Version v1.4.4.1; changes since v1.4.4:
32113 ---------------------------------------
32115 Alexandre Julliard (1):
32116 gitweb: Put back shortlog instead of graphiclog in the project list.
32119 Move --pretty options into Documentation/pretty-formats.txt
32122 Run "git repack -a -d" once more at end, if there's 1MB or more of not-packed data.
32124 Johannes Schindelin (1):
32125 Seek back to current filepos when mmap()ing with NO_MMAP
32127 Junio C Hamano (7):
32128 git-checkout: do not allow -f and -m at the same time.
32129 git-checkout: allow pathspec to recover lost working tree directory
32130 convert-objects: set _XOPEN_SOURCE to 600
32131 git-fetch: follow lightweit tags as well.
32132 do_for_each_ref: perform the same sanity check for leftovers.
32133 trust-executable-bit: fix breakage for symlinks
32136 Linus Torvalds (2):
32137 git-pull: allow pulling into an empty repository
32138 "git fmt-merge-msg" SIGSEGV
32141 archive: use setvbuf() instead of setlinebuf()
32143 Paolo Ciarrocchi (2):
32144 Teach SubmittingPatches about git-commit -s
32145 Doc: Make comment about merging in tutorial.txt more clear
32148 Fix git-for-each-refs broken for tags
32149 git-apply: Documentation typo fix
32150 Documentation: Define symref and update HEAD description
32151 Documentation: Correct alternates documentation, document http-alternates
32154 sparse fix: non-ANSI function declaration
32155 sparse fix: Using plain integer as NULL pointer
32156 git-apply: slightly clean up bitfield usage
32157 Document git-runstatus
32160 Version v1.4.4; changes since v1.4.4-rc2:
32161 -----------------------------------------
32164 test-lib.sh: A command dying due to a signal is an unexpected failure.
32165 Catch errors when writing an index that contains invalid objects.
32168 git-update-index(1): fix use of quoting in section title
32170 Junio C Hamano (1):
32173 Robin Rosenberg (1):
32174 Rework cvsexportcommit to handle binary files for all cases.
32177 Version v1.4.4-rc2; changes since v1.4.4-rc1:
32178 ---------------------------------------------
32181 git-svn: avoid printing filenames of files we're not tracking
32182 git-svn: don't die on rebuild when --upgrade is specified
32183 git-svn: fix dcommit losing changes when out-of-date from svn
32185 Jakub Narębski (3):
32186 gitweb: Better git-unquoting and gitweb-quoting of pathnames
32187 gitweb: Use character or octal escape codes (and add span.cntrl) in esc_path
32188 gitweb: New improved patchset view
32190 Junio C Hamano (14):
32191 gitweb: fix disabling of "forks"
32192 gitweb: minimally fix "fork" support.
32193 gitweb: do not give blame link unconditionally in diff-tree view
32194 git-status: quote LF in its output
32195 git-pickaxe: retire pickaxe
32196 gitweb: protect blob and diff output lines from controls.
32197 gitweb: protect commit messages from controls.
32198 gitweb: fix unmatched div in commitdiff
32199 Documentation: move blame examples
32200 git-annotate: no need to exec blame; it is built-in now.
32201 git-annotate: fix -S on graft file with comments.
32202 path-list: fix path-list-insert return value
32203 git-cvsserver: read from git with -z to get non-ASCII pathnames.
32206 OGAWA Hirofumi (1):
32207 gitk: Fix nextfile() and add prevfile()
32210 Nicer error messages in case saving an object to db goes wrong
32212 Robert Shearman (1):
32213 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
32216 Version v1.4.4-rc1; changes since v1.4.3.5:
32217 -------------------------------------------
32220 Gitweb - provide site headers and footers
32222 Alexandre Julliard (5):
32223 pack-refs: Store the full name of the ref even when packing only tags.
32224 git.el: Added functions for moving to the next/prev unmerged file.
32225 git.el: Added a function to open the current file in another window.
32226 git.el: Move point after the log message header when entering log-edit mode.
32227 git.el: Include MERGE_MSG in the log-edit buffer even when not committing a merge.
32230 Make filenames line up in git-status output
32231 Remove uneccessarily similar printf() from print_ref_list() in builtin-branch
32233 Andy Whitcroft (2):
32234 cvsimport: move over to using git-for-each-ref to read refs.
32235 git-for-each-ref: improve the documentation on scripting modes
32237 Aneesh Kumar K.V (1):
32238 gitweb: Remove extra "/" in path names for git_get_project_list
32240 Christian Couder (12):
32241 Add [-s|--hash] option to Linus' show-ref.
32242 Use Linus' show ref in "git-branch.sh".
32243 Document git-show-ref [-s|--hash] option.
32244 Fix show-ref usage for --dereference.
32245 Add pack-refs and show-ref test cases.
32246 When creating branch c/d check that branch c does not already exists.
32247 Uncomment test case: git branch c/d should barf if branch c exists.
32248 Fix a remove_empty_dir_recursive problem.
32249 Clean up "git-branch.sh" and add remove recursive dir test cases.
32250 Use git-update-ref to delete a tag instead of rm()ing the ref file.
32251 Check that a tag exists using show-ref instead of looking for the ref file.
32252 Do not create tag leading directories since git update-ref does it.
32254 Dennis Stosberg (3):
32255 lock_ref_sha1_basic does not remove empty directories on BSD
32256 Remove bashism from t3210-pack-refs.sh
32257 Bash completion support for aliases
32259 Dmitry V. Levin (1):
32260 git-clone: define die() and use it.
32263 Use memmove instead of memcpy for overlapping areas
32266 git-send-email: do not pass custom Date: header
32267 git-svn: avoid printing filenames of files we're not tracking
32268 git-svn: don't die on rebuild when --upgrade is specified
32270 Jakub Narębski (14):
32271 gitweb: Improve git_print_page_path
32272 gitweb: Add '..' (up directory) to tree view if applicable
32273 gitweb: Get rid of git_print_simplified_log
32274 gitweb: Filter out commit ID from @difftree in git_commit and git_commitdiff
32275 gitweb: Print commit message without title in commitdiff only if there is any
32276 gitweb: Use --no-commit-id in git_commit and git_commitdiff
32277 Documentation: Update information about <format> in git-for-each-ref
32278 gitweb: Move git_get_last_activity subroutine earlier
32279 gitweb: Add "next" link to commitdiff view
32280 gitweb: Secure against commit-ish/tree-ish with the same name as path
32281 gitweb: Use 's' regexp modifier to secure against filenames with LF
32282 gitweb: Use git-for-each-ref to generate list of heads and/or tags
32283 gitweb: Output also empty patches in "commitdiff" view
32284 gitweb: Better support for non-CSS aware web browsers
32287 wt-status: use simplified resolve_ref to find current branch
32288 gitignore: git-pack-refs is a generated file.
32289 gitignore: git-show-ref is a generated file.
32290 git-pickaxe: work properly in a subdirectory.
32293 Don't use $author_name undefined when $from contains no /\s</.
32295 Johannes Schindelin (3):
32296 Fix git-update-index --again
32297 show-branch: mark active branch with a '*' again
32298 Turn on recursive with --summary
32301 Add man page for git-show-ref
32303 Junio C Hamano (96):
32304 Add git-for-each-ref: helper for language bindings
32305 Fix t1400-update-ref test minimally
32306 fsck-objects: adjust to resolve_ref() clean-up.
32307 symbolit-ref: fix resolve_ref conversion.
32308 Add callback data to for_each_ref() family.
32309 Tell between packed, unpacked and symbolic refs.
32310 pack-refs: do not pack symbolic refs.
32311 git-pack-refs --prune
32312 pack-refs: fix git_path() usage.
32313 lock_ref_sha1_basic: remove unused parameter "plen".
32314 Clean-up lock-ref implementation
32315 update-ref: -d flag and ref creation safety.
32316 update a few Porcelain-ish for ref lock safety.
32317 Teach receive-pack about ref-log
32318 receive-pack: call setup_ident before git_config
32320 teach revision walker about --all-match.
32321 git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1)
32322 ref locking: allow 'foo' when 'foo/bar' used to exist but not anymore.
32323 refs: minor restructuring of cached refs data.
32324 lock_ref_sha1(): do not sometimes error() and sometimes die().
32325 lock_ref_sha1(): check D/F conflict with packed ref when creating.
32326 delete_ref(): delete packed ref
32327 git-branch: remove D/F check done by hand.
32328 show-ref --hash=len, --abbrev=len, and --abbrev
32329 git-fetch: adjust to packed-refs.
32330 Fix refs.c;:repack_without_ref() clean-up path
32331 gitweb: make leftmost column of blame less cluttered.
32332 git-fetch: do not look into $GIT_DIR/refs to see if a tag exists.
32333 pack-refs: use lockfile as everybody else does.
32334 gitweb: prepare for repositories with packed refs.
32335 Revert 954a6183756a073723a7c9fd8d2feb13132876b0
32336 pack-refs: call fflush before fsync.
32337 blame.c: whitespace and formatting clean-up.
32338 git-blame: --show-name (and -f)
32339 git-blame: --show-number (and -n)
32340 blame.c: move code to output metainfo into a separate function.
32341 git-send-email: do not drop custom headers the user prepared
32342 ref-log: allow ref@{count} syntax.
32343 git-send-email: real name with period need to be dq-quoted on From: line
32344 git-blame --porcelain
32345 gitweb: use blame --porcelain
32346 Make git-send-email detect mbox-style patches more readily
32347 core.logallrefupdates create new log file only for branch heads.
32348 git-pack-refs --all
32349 core.logallrefupdates thinko-fix
32350 pack-objects: document --delta-base-offset option
32351 blame: Document and add help text for -f, -n, and -p
32352 gitweb: spell "blame --porcelain" with -p
32353 git-repack: repo.usedeltabaseoffset
32355 gitweb: use for-each-ref to show the latest activity across branches
32356 ref-log: fix D/F conflict coming from deleted refs.
32357 git-pickaxe: blame rewritten.
32358 git-pickaxe -M: blame line movements within a file.
32359 git-pickaxe -C: blame cut-and-pasted lines.
32360 git-pickaxe: pagenate output by default.
32361 git-pickaxe: fix nth_line()
32362 git-pickaxe: improve "best match" heuristics
32363 git-pickaxe: introduce heuristics to avoid "trivial" chunks
32364 git-pickaxe: do not keep commit buffer.
32365 git-pickaxe: do not confuse two origins that are the same.
32366 git-pickaxe: get rid of wasteful find_origin().
32367 git-pickaxe: swap comparison loop used for -C
32368 sha1_name.c: avoid compilation warnings.
32369 t3200: git-branch testsuite update
32370 tests: merge-recursive is usable without Python
32371 merge: loosen overcautious "working file will be lost" check.
32372 merge-recursive: use abbreviated commit object name.
32373 merge-recursive: make a few functions static.
32374 merge-recursive: adjust to loosened "working file clobbered" check
32375 t6022: ignoring untracked files by merge-recursive when they do not matter
32376 Documentation: fix git-format-patch mark-up and link it from git.txt
32377 send-pack --keep: do not explode into loose objects on the receiving end.
32378 git-pickaxe: WIP to refcount origin structure.
32379 git-pickaxe: allow -Ln,m as well as -L n,m
32380 git-pickaxe: refcount origin correctly in find_copy_in_parent()
32381 git-pickaxe: tighten sanity checks.
32382 Revert "send-pack --keep: do not explode into loose objects on the receiving end."
32383 git-pickaxe: split find_origin() into find_rename() and find_origin().
32384 git-pickaxe: cache one already found path per commit.
32385 Introduce a new revision set operator <rev>^!
32386 branch: work in subdirectories.
32387 for-each-ref: "creator" and "creatordate" fields
32388 git-pickaxe: rename detection optimization
32389 git-pickaxe: simplify Octopus merges further
32390 git-pickaxe: re-scan the blob after making progress with -M
32391 git-pickaxe: re-scan the blob after making progress with -C
32392 git-pickaxe: fix origin refcounting
32393 cherry is built-in, do not ship git-cherry.sh
32394 git-blame: add internal statistics to count read blobs.
32395 git-pickaxe: optimize by avoiding repeated read_sha1_file().
32396 Document git-pack-refs and link it to git(7).
32397 git-pickaxe: -L /regexp/,/regexp/
32398 git-pickaxe: allow "-L <something>,+N"
32401 Karl Hasselström (1):
32402 ignore-errors requires cl
32405 Make git-branch a builtin
32406 Fix show-ref usagestring
32408 Linus Torvalds (8):
32409 Add "git show-ref" builtin command
32410 Teach "git checkout" to use git-show-ref
32411 Start handling references internally as a sorted in-memory list
32412 Add support for negative refs
32413 Make ref resolution saner
32414 Enable the packed refs file format
32415 Allow '-' in config variable names
32416 git push: add verbose flag and allow overriding of default target repository
32419 gitweb: blame: print commit-8 on the leading row of a commit-block
32420 gitweb: blame: Mouse-over commit-8 shows author and date
32421 gitweb: blame porcelain: lineno and orig lineno swapped
32422 git-revert with conflicts to behave as git-merge with conflicts
32423 gitweb: esc_html() author in blame
32426 gitweb: start to generate PATH_INFO URLs.
32427 gitweb: warn if feature cannot be overridden.
32429 Matthew Wilcox (1):
32430 Add --dry-run option to git-send-email
32432 Nicolas Pitre (24):
32433 introduce delta objects with offset to base
32434 teach git-unpack-objects about deltas with offset to base
32435 teach git-index-pack about deltas with offset to base
32436 make git-pack-objects able to create deltas with offset to base
32437 make pack data reuse compatible with both delta types
32438 let the GIT native protocol use offsets to delta base when possible
32439 zap a debug remnant
32440 allow delta data reuse even if base object is a preferred base
32441 index-pack: compare only the first 20-bytes of the key.
32442 add the capability for index-pack to read from a stream
32443 enable index-pack streaming capability
32444 make index-pack able to complete thin packs.
32445 add progress status to index-pack
32446 mimic unpack-objects when --stdin is used with index-pack
32447 enhance clone and fetch -k experience
32448 index-pack: minor fixes to comment and function name
32449 missing small substitution
32450 make git-push a bit more verbose
32451 Allow pack header preprocessing before unpack-objects/index-pack.
32452 git-fetch can use both --thin and --keep with fetch-pack now
32453 improve fetch-pack's handling of kept packs
32454 have index-pack create .keep file more carefully
32455 remove .keep pack lock files when done with refs update
32456 git-pack-objects progress flag documentation and cleanup
32459 Fix broken sha1 locking
32460 Fix buggy ref recording
32461 gitweb: Document features better
32462 gitweb: Fix search form when PATH_INFO is enabled
32463 bisect reset: Leave the tree in usable state if git-checkout failed
32464 gitweb: Restore object-named links in item lists
32465 gitweb: Make search type a popup menu
32466 gitweb: Do not automatically append " git" to custom site name
32467 gitweb: Show project's README.html if available
32468 gitweb: Support for 'forks'
32469 gitweb: Fix up bogus $stylesheet declarations
32472 git-archive --format=zip: use default version ID
32473 git-archive --format=zip: add symlink support
32475 Make git-cherry handle root trees
32477 Robert Shearman (2):
32478 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
32479 git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.
32481 Robin Rosenberg (2):
32482 Mention that pull can work locally in the synopsis
32483 Swap the porcelain and plumbing commands in the git man page
32486 Remove git-annotate.perl and create a builtin-alias for git-blame
32489 fetch: Misc output cleanup
32490 merge and resolve: Output short hashes and .. in "Updating ..."
32492 Sasha Khapyorsky (2):
32493 git-svnimport.perl: copying directory from original SVN place
32494 git-svnimport: support for partial imports
32496 Sean Estabrooks (1):
32497 Add --global option to git-repo-config.
32500 git-send-email: Document support for local sendmail instead of SMTP server
32501 git-send-email: Read the default SMTP server from the GIT config file
32503 Shawn O. Pearce (15):
32504 Use column indexes in git-cvsserver where necessary.
32505 Allow short pack names to git-pack-objects --unpacked=.
32506 Only repack active packs by skipping over kept packs.
32507 Teach git-index-pack how to keep a pack file.
32508 Remove unused variable in receive-pack.
32509 Move deny_non_fast_forwards handling completely into receive-pack.
32510 Teach receive-pack how to keep pack files based on object count.
32511 Added completion support for git-branch.exe.
32512 Added bash completion support for git-reset.
32513 Added missing completions for show-branch and merge-base.
32514 Only load .exe suffix'd completions on Cygwin.
32515 Bash completion support for remotes in .git/config.
32516 Take --git-dir into consideration during bash completion.
32517 Support bash completion on symmetric difference operator.
32518 Remove more sed invocations from within bash completion.
32521 Version v1.4.3.5; changes since v1.4.3.4:
32522 -----------------------------------------
32525 merge-recursive implicitely depends on trust_executable_bit
32528 git-svn: avoid printing filenames of files we're not tracking
32529 git-svn: don't die on rebuild when --upgrade is specified
32530 git-svn: fix dcommit losing changes when out-of-date from svn
32532 Jakub Narębski (1):
32533 Documentation: Transplanting branch with git-rebase --onto
32536 Fix git-runstatus for repositories containing a file named HEAD
32538 Junio C Hamano (3):
32539 adjust_shared_perm: chmod() only when needed.
32540 path-list: fix path-list-insert return value
32541 git-cvsserver: read from git with -z to get non-ASCII pathnames.
32544 Nicer error messages in case saving an object to db goes wrong
32546 Robert Shearman (1):
32547 git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
32550 remove an unneeded test
32553 Version v1.4.3.4; changes since v1.4.3.3:
32554 -----------------------------------------
32557 Minor grammar fixes for git-diff-index.txt
32558 git-clone documentation didn't mention --origin as equivalent of -o
32560 Christian Couder (3):
32561 Remove --syslog in git-daemon inetd documentation examples.
32562 Documentation: add upload-archive service to git-daemon.
32563 Documentation: add git in /etc/services.
32566 Use memmove instead of memcpy for overlapping areas
32568 J. Bruce Fields (1):
32569 Documentation: updates to "Everyday GIT"
32571 Jakub Narębski (3):
32572 diff-format.txt: Combined diff format documentation supplement
32573 diff-format.txt: Correct information about pathnames quoting in patch format
32574 gitweb: Check git base URLs before generating URL from it
32577 Continue traversal when rev-list --unpacked finds a packed commit.
32579 Johannes Schindelin (1):
32580 link_temp_to_file: call adjust_shared_perm() only when we created the directory
32582 Junio C Hamano (9):
32583 Documentation: clarify refname disambiguation rules.
32584 combine-diff: a few more finishing touches.
32585 combine-diff: fix hunk_comment_line logic.
32586 combine-diff: honour --no-commit-id
32587 Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"
32588 quote.c: ensure the same quoting across platforms.
32589 revision traversal: --unpacked does not limit commit list anymore.
32590 link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure
32591 apply: handle "traditional" creation/deletion diff correctly.
32594 pack-objects doesn't create random pack names
32597 git-cherry: document limit and add diagram
32599 Shawn O. Pearce (3):
32600 Use ULONG_MAX rather than implicit cast of -1.
32601 Remove SIMPLE_PROGRAMS and make git-daemon a normal program.
32602 Remove unsupported C99 style struct initializers in git-archive.
32605 Version v1.4.3.3; changes since v1.4.3.2:
32606 -----------------------------------------
32609 git-svn: fix symlink-to-file changes when using command-line svn 1.4.0
32612 Set $HOME for selftests
32614 Junio C Hamano (5):
32615 Documentation: note about contrib/.
32616 RPM package re-classification.
32617 Refer to git-rev-parse:Specifying Revisions from git.txt
32618 Update cherry documentation.
32619 Documentation/SubmittingPatches: 3+1 != 6
32622 xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
32625 git-fetch.sh printed protocol fix
32628 Version v1.4.3.2; changes since v1.4.3.1:
32629 -----------------------------------------
32631 Alexandre Julliard (1):
32632 prune-packed: Fix uninitialized variable.
32634 J. Bruce Fields (1):
32635 Make prune also run prune-packed
32637 Jakub Narębski (2):
32638 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)
32639 gitweb: Do not esc_html $basedir argument to git_print_tree_entry
32642 git-clone: honor --quiet
32643 xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
32645 Junio C Hamano (2):
32646 pager: default to LESS=FRSX not LESS=FRS
32647 daemon: do not die on older clients.
32649 Karl Hasselström (1):
32650 git-vc: better installation instructions
32653 Fix usagestring for git-branch
32656 gitweb: Fix setting $/ in parse_commit()
32659 git-merge: show usage if run without arguments
32662 Documentation for the [remote] config
32665 Version v1.4.3.1; changes since v1.4.3:
32666 ---------------------------------------
32668 Junio C Hamano (1):
32669 pager: default to LESS=FRS
32672 Fix typo in show-index.c
32674 Linus Torvalds (1):
32675 git-apply: prepare for upcoming GNU diff -u format change.
32677 Nguyễn Thái Ngọc Duy (2):
32678 Reject hexstring longer than 40-bytes in get_short_sha1()
32679 Add revspec documentation for ':path', ':[0-3]:path' and git-describe
32682 reduce delta head inflated size
32685 Version v1.4.3; changes since v1.4.3-rc3:
32686 -----------------------------------------
32688 Andy Whitcroft (1):
32689 add proper dependancies on the xdiff source
32691 Junio C Hamano (1):
32692 Revert "move pack creation to version 3"
32694 Linus Torvalds (1):
32695 Fix hash function in xdiff library
32698 git-imap-send: Strip smtp From_ header from imap message.
32701 svnimport: Fix broken tags being generated
32704 Make write_sha1_file_prepare() void
32705 Replace open-coded version of hash_sha1_file()
32708 Version v1.4.3-rc3; changes since v1.4.3-rc2:
32709 ---------------------------------------------
32711 Christian Couder (1):
32712 Fix tracing when GIT_TRACE is set to an empty string.
32715 git-svn: multi-init saves and reuses --tags and --branches arguments
32716 git-svn: log command fixes
32717 Documentation/git-svn: document some of the newer features
32718 git-svn: -h(elp) message formatting fixes
32719 commit: fix a segfault when displaying a commit with unreachable parents
32720 git-svn: add a message encouraging use of SVN::* libraries
32721 git-svn: fix commits over svn+ssh://
32722 git-svn: reduce memory usage for large commits
32724 Johannes Schindelin (3):
32725 diff: fix 2 whitespace issues
32726 cvsserver: Show correct letters for modified, removed and added files
32727 cvsserver: fix "cvs diff" in a subdirectory
32729 Junio C Hamano (6):
32730 Add WEBDAV timeout to http-fetch.
32731 git-fetch --update-head-ok typofix
32732 git-pull: we say commit X, not X commit.
32733 git.spec.in: perl subpackage is installed in perl_vendorlib not vendorarch
32734 apply --numstat -z: line termination fix.
32735 t4015: work-around here document problem on Cygwin.
32738 paginate git-diff by default
32741 atomic write for sideband remote messages
32744 Documentation: add missing second colons and remove a typo
32745 Add hash_sha1_file()
32746 Make write_sha1_file_prepare() static
32749 clone: the given repository dir should be relative to $PWD
32752 Version v1.4.3-rc2; changes since v1.4.3-rc1:
32753 ---------------------------------------------
32756 Update the gitweb/README file to include setting the GITWEB_CONFIG environment
32757 Fix usage string to match that given in the man page
32759 Alexandre Julliard (2):
32760 git.el: Fixed inverted "renamed from/to" message.
32761 vc-git.el: Switch to using git-blame instead of git-annotate.
32763 Dennis Stosberg (2):
32764 lock_ref_sha1_basic does not remove empty directories on BSD
32765 Add default values for --window and --depth to the docs
32767 Franck Bui-Huu (1):
32768 Add git-upload-archive to the main git man page
32770 Jakub Narębski (1):
32771 gitweb: Cleanup Git logo and Git logo target generation
32773 Junio C Hamano (9):
32774 Makefile: install and clean merge-recur, still.
32775 git-mv: invalidate the removed path properly in cache-tree
32776 git-push: .git/remotes/ file does not require SP after colon
32777 escape tilde in Documentation/git-rev-parse.txt
32778 tar-tree deprecation: we eat our own dog food.
32779 gitweb: Make the Git logo link target to point to the homepage
32780 git-send-email: avoid uninitialized variable warning.
32781 cherry-pick: make -r the default
32785 gitweb: Escape ESCAPE (\e) character
32786 gitweb: Do not print "log" and "shortlog" redundantly in commit view
32787 gitweb: blame: Minimize vertical table row padding
32790 gitweb: document webserver configuration for common gitweb/repo URLs.
32791 git-commit: cleanup unused function.
32792 git-commit: fix coding style.
32793 test-lib: separate individual test better in verbose mode.
32796 add commit count options to git-shortlog
32799 Show snapshot link in shortlog only if have_snapsho
32800 gitweb: Separate (new) and (deleted) in commitdiff by a space
32801 gitweb: Handle commits with empty commit messages more reasonably
32802 gitweb: [commit view] Do not suppress commitdiff link in root commit
32805 git-tar-tree: don't RUN_SETUP
32807 Robin Rosenberg (1):
32808 Error in test description of t1200-tutorial
32811 gitweb: refactor decode() for utf8 conversion
32814 Version v1.4.3-rc1; changes since v1.4.2.4:
32815 -------------------------------------------
32818 Use const for interpolate arguments
32819 fix daemon.c compilation for NO_IPV6=1
32820 do not discard constness in interp_set_entry value argument
32822 Andy Whitcroft (3):
32823 send-pack: remove remote reference limit
32824 send-pack: switch to using git-rev-list --stdin
32825 svnimport: add support for parsing From: lines for author
32827 Aneesh Kumar K.V (4):
32828 gitweb: Support for snapshot
32829 gitweb: fix snapshot support
32830 gitweb: Make blame and snapshot a feature.
32831 gitweb: Fix git_blame
32834 Patch for http-fetch.c and older curl releases
32836 Christian Couder (8):
32837 Trace into open fd and refactor tracing code.
32838 Trace into a file or an open fd and refactor tracing code.
32839 Update GIT_TRACE documentation.
32840 Fix memory leak in prepend_to_path (git.c).
32841 Move add_to_string to "quote.c" and make it extern.
32842 Fix a memory leak in "connect.c" and die if command too long.
32843 Fix space in string " false" problem in "trace.c".
32844 Remove empty ref directories that prevent creating a ref.
32846 David Rientjes (18):
32847 blame.c return cleanup
32848 builtin-grep.c cleanup
32849 builtin-push.c cleanup
32851 http-push.c cleanup
32852 read-cache.c cleanup
32853 Make pprint_tag void and cleans up call in cmd_cat_file.
32854 Make show_entry void
32855 Make checkout_all void.
32856 Make fsck_dir void.
32857 Make pack_objects void.
32858 Make track_tree_refs void.
32859 Make upload_pack void and remove conditional return.
32860 Make sha1flush void and remove conditional return.
32861 make inline is_null_sha1 global
32862 use appropriate typedefs
32863 remove unnecessary initializations
32864 Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
32866 Dennis Stosberg (10):
32867 "test" in Solaris' /bin/sh does not support -e
32868 Makefile fix for Solaris
32869 Add possibility to pass CFLAGS and LDFLAGS specific to the perl subdir
32870 Solaris has strlcpy() at least since version 8
32871 Look for sockaddr_storage in sys/socket.h
32872 Fix detection of ipv6 on Solaris
32873 Fix compilation with Sun CC
32874 gitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}
32875 gitweb: Remove forgotten call to git_to_hash
32876 use do() instead of require() to include configuration
32878 Dmitry V. Levin (3):
32879 Make count-objects, describe and merge-tree work in subdirectory
32880 Documentation: Fix broken links
32881 Handle invalid argc gently
32884 pass DESTDIR to the generated perl/Makefile
32885 git-svn: establish new connections on commit after fork
32886 git-svn: recommend rebase for syncing against an SVN repo
32887 git-svn: add the 'dcommit' command
32888 git-svn: stop repeatedly reusing the first commit message with dcommit
32890 Franck Bui-Huu (10):
32891 Add a newline before appending "Signed-off-by: " line
32892 log-tree.c: cleanup a bit append_signoff()
32894 git-archive: wire up TAR format.
32895 git-archive: wire up ZIP format.
32896 Add git-upload-archive
32897 connect.c: finish_connect(): allow null pid parameter
32898 Test return value of finish_connect()
32899 upload-archive: monitor child communication even more carefully.
32900 git-archive: update documentation
32902 Haavard Skinnemoen (1):
32903 git-send-email: Don't set author_not_sender from Cc: lines
32905 Jakub Narębski (138):
32906 gitweb: whitespace cleanup
32907 gitweb: Use list for of open for running git commands, thorougly.
32908 gitweb: simplify git_get_hash_by_path
32909 gitweb: More explicit error messages for open "-|"
32910 gitweb: Cleanup - chomp $line in consistent style
32911 gitweb: Cleanup - chomp @lines in consistent style
32912 gitweb: Add git_page_nav for later use
32913 gitweb: Navbar refactoring - use git_page_nav to generate navigation bar
32914 gitweb: Replace form-feed character by ^L
32915 gitweb: Show project descriptions with utf-8 characters in project list correctly
32916 gitweb: Add "\n" after <br/> in git_page_nav
32917 gitweb: Pager refactoring - use git_get_paging_nav for pagination
32918 gitweb: Remove $project from git_get_paging_nav arguments
32919 gitweb: Headers refactoring - use git_header_div for header divs
32920 gitweb: Remove characters entities entirely when shortening string
32921 gitweb: Ref refactoring - use git_get_referencing for marking tagged/head commits
32922 gitweb: Refactor generation of shortlog, tags and heads body
32923 gitweb: do not quote path for list version of open "-|"
32924 gitweb: Remove characters entities entirely when shortening string -- correction
32925 gitweb: Reordering code and dividing it into categories
32926 gitweb: Refactoring git_project_list
32927 autoconf: Add support for setting SHELL_PATH and PERL_PATH
32928 autoconf: Move site configuration section earlier in configure.ac
32929 autoconf: Add support for setting PYTHON_PATH or NO_PYTHON
32930 autoconf: Check for ll hh j z t size specifiers introduced by C99
32931 autoconf: Typo cleanup, reordering etc.
32932 Copy description of new build configuration variables to configure.ac
32933 autoconf: Set NEEDS_LIBICONV unconditionally if there is no iconv in libc
32934 gitweb: Separate input validation and dispatch, add comment about opml action
32935 gitweb: die_error first (optional) parameter is HTTP status
32936 gitweb: Use undef for die_error to use default first (status) parameter value
32937 gitweb: Don't undefine query parameter related variables before die_error
32938 gitweb: Cleanup and uniquify error messages
32939 gitweb: No periods for error messages
32940 gitweb: No error messages with unescaped/unprotected user input
32941 gitweb: PATH_INFO=/ means no project
32942 gitweb: Inline $rss_link
32943 gitweb: Refactor untabifying - converting tabs to spaces
32944 gitweb: fix commitdiff for root commits
32945 gitweb: Skip nonmatching lines in difftree output, consistently
32946 autoconf: Unset NO_STH and NEED_STH when it is detected not needed
32947 gitweb: Remove unused variables in git_shortlog_body and git_heads
32948 autoconf: Add configure target to main Makefile
32949 autoconf: Error out on --without-shell and --without-perl
32950 autoconf: Improvements in NO_PYTHON/PYTHON_PATH handling
32951 autoconf: Move variables which we always set to config.mak.in
32952 autoconf: It is --without-python, not --no-python
32953 autoconf: Add support for setting CURLDIR, OPENSSLDIR, EXPATDIR
32954 gitweb: Whitespace cleanup - tabs are for indent, spaces are for align
32955 gitweb: Great subroutines renaming
32956 gitweb: Separate ref parsing in git_get_refs_list into parse_ref
32957 gitweb: Refactor printing shortened title in git_shortlog_body and git_tags_body
32958 gitweb: Separate main part of git_history into git_history_body
32959 gitweb: Separate finding project owner into git_get_project_owner
32960 gitweb: Change appereance of marker of refs pointing to given object
32961 gitweb: Skip comments in mime.types like file
32962 gitweb: True fix: Support for the standard mime.types map in gitweb
32963 gitweb: Separate printing difftree in git_commit into git_difftree_body
32964 gitweb: Show project's git URL on summary page
32965 gitweb: Add support for per project git URLs
32966 gitweb: Uniquify version info output, add meta generator in page header
32967 gitweb: Refactor printing commit message
32968 gitweb: Added parse_difftree_raw_line function for later use
32969 gitweb: Use parse_difftree_raw_line in git_difftree_body
32970 gitweb: bugfix: a.list formatting regression
32971 gitweb: Replace some presentational HTML by CSS
32972 gitweb: Whitespace cleanup: realign, reindent
32973 gitweb: Use underscore instead of hyphen to separate words in HTTP headers names
32974 gitweb: Route rest of action subroutines through %actions
32975 gitweb: Use here-doc
32976 gitweb: Drop the href() params which keys are not in %mapping
32977 gitweb: Sort CGI parameters returned by href()
32978 gitweb: Use git-diff-tree patch output for commitdiff
32979 gitweb: Show information about incomplete lines in commitdiff
32980 gitweb: Remove invalid comment in format_diff_line
32981 gitweb: Streamify patch output in git_commitdiff
32982 gitweb: Add git_get_{following,preceding}_references functions
32983 gitweb: Faster return from git_get_preceding_references if possible
32984 gitweb: Add git_get_rev_name_tags function
32985 gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header
32986 gitweb: Add support for hash_parent_base parameter for blobdiffs
32987 gitweb: Allow for pre-parsed difftree info in git_patchset_body
32988 gitweb: Parse two-line from-file/to-file diff header in git_patchset_body
32989 gitweb: Add invisible hyperlink to from-file/to-file diff header
32990 gitweb: Always display link to blobdiff_plain in git_blobdiff
32991 gitweb: Change here-doc back for style consistency in git_blobdiff
32992 gitweb: Use git-diff-tree or git-diff patch output for blobdiff
32993 gitweb: git_blobdiff_plain is git_blobdiff('plain')
32994 gitweb: Remove git_diff_print subroutine
32995 gitweb: Remove creating directory for temporary files
32996 gitweb: git_annotate didn't expect negative numeric timezone
32997 gitweb: Remove workaround for git-diff bug fixed in f82cd3c
32998 gitweb: Improve comments about gitweb features configuration
32999 gitweb: blobs defined by non-textual hash ids can be cached
33000 gitweb: Fix typo in git_difftree_body
33001 gitweb: Fix typo in git_patchset_body
33002 gitweb: Remove unused git_get_{preceding,following}_references
33003 gitweb: Remove git_to_hash function
33004 gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete
33005 gitweb: Make git_print_log generic; git_print_simplified_log uses it
33006 gitweb: Do not remove signoff lines in git_print_simplified_log
33007 gitweb: Add author information to commitdiff view
33008 gitweb: git_print_log: signoff line is non-empty line
33009 gitweb: Add diff tree, with links to patches, to commitdiff view
33010 gitweb: Add local time and timezone to git_print_authorship
33011 gitweb: Move git-ls-tree output parsing to parse_ls_tree_line
33012 gitweb: Separate printing of git_tree row into git_print_tree_entry
33013 gitweb: Extend parse_difftree_raw_line to save commit info
33014 gitweb: Change the name of diff to parent link in "commit" view to "diff
33015 gitweb: Add GIT favicon, assuming image/png type
33016 gitweb: Correct typo: '==' instead of 'eq' in git_difftree_body
33017 gitweb: Divide page path into directories -- path's "breadcrumbs"
33018 autoconf: Add -liconv to LIBS when NEEDS_LIBICONV
33019 autoconf: Check for subprocess.py
33020 autoconf: Quote AC_CACHE_CHECK arguments
33021 autoconf: Fix copy'n'paste error
33022 autoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv
33023 autoconf: Add support for setting NO_ICONV and ICONVDIR
33024 autoconf: Add config.cache to .gitignore
33025 gitweb: Make pickaxe search a feature
33026 gitweb: Paginate history output
33027 gitweb: Use File::Find::find in git_get_projects_list
33028 gitweb: Do not parse refs by hand, use git-peek-remote instead
33029 gitweb: Add git_project_index for generating index.aux
33030 gitweb: Allow for href() to be used for links without project param
33031 gitweb: Add link to "project_index" view to "project_list" page
33032 gitweb: Fix mimetype_guess_file for files with multiple extensions
33033 gitweb: Even more support for PATH_INFO based URLs
33034 gitweb: Require project for almost all actions
33035 gitweb: Always use git-peek-remote in git_get_references
33036 gitweb: Make git_get_refs_list do work of git_get_references
33037 gitweb: Fix thinko in git_tags and git_heads
33038 gitweb: Make git_get_hash_by_path check type if provided
33039 gitweb: Strip trailing slashes from $path in git_get_hash_by_path
33040 gitweb: Use "return" instead of "return undef" for some subs
33041 gitweb: Split validate_input into validate_pathname and validate_refname
33042 gitweb: Add git_url subroutine, and use it to quote full URLs
33043 gitweb: Quote filename in HTTP Content-Disposition: header
33046 gitweb: optionally read config from GITWEB_CONFIG
33047 diff: support custom callbacks for output
33048 Move color option parsing out of diff.c and into color.[ch]
33049 git-commit.sh: convert run_status to a C builtin
33050 git-status: document colorization config options
33051 contrib/vim: add syntax highlighting file for commits
33052 wt-status: remove extraneous newline from 'deleted:' output
33053 rev-list: fix segfault with --{author,committer,grep}
33054 git-repack: allow git-repack to run in subdirectory
33056 Johannes Schindelin (35):
33057 Git.xs: older perl do not know const char *
33058 Status update on merge-recursive in C
33059 Cumulative update of merge-recursive in C
33060 merge-recur: Convert variable names to lower_case
33061 merge-recur: Get rid of debug code
33062 merge-recur: Remove dead code
33063 merge-recur: Fix compiler warning with -pedantic
33064 merge-recur: Cleanup last mixedCase variables...
33065 merge-recur: Explain why sha_eq() and struct stage_data cannot go
33066 merge-recur: fix thinko in unique_path()
33067 read-trees: refactor the unpack_trees() part
33068 read-tree: move merge functions to the library
33069 merge-recur: use the unpack_trees() interface instead of exec()ing read-tree
33070 merge-recur: virtual commits shall never be parsed
33071 merge-recursive: fix rename handling
33072 http-push: avoid fork() by calling merge_bases() directly
33073 merge-recur: do not call git-write-tree
33074 merge-recur: do not setenv("GIT_INDEX_FILE")
33075 merge-recur: if there is no common ancestor, fake empty one
33076 merge-recur: try to merge older merge bases first
33077 merge-recur: do not die unnecessarily
33078 discard_cache(): discard index, even if no file was mmap()ed
33079 Add the --color-words option to the diff options family
33080 builtin-mv: readability patch
33081 unpack-objects: remove unused variable "eof"
33083 Remove uneeded #include
33084 fmt-merge-msg: fix off-by-one bug
33085 Teach runstatus about --untracked
33086 add receive.denyNonFastforwards config variable
33087 receive-pack: plug memory leak in fast-forward checking code.
33088 Document receive.denyNonFastforwards
33089 runstatus: do not recurse into subdirectories if not needed
33090 daemon: default to 256 for HOST_NAME_MAX if it is not defined
33091 diff --stat: ensure at least one '-' for deletions, and one '+' for additions
33094 Add virtualization support to git-daemon
33095 Cleaned up git-daemon virtual hosting support.
33096 Removed memory leaks from interpolation table uses.
33098 Jonas Fonseca (21):
33099 git-apply(1): document missing options and improve existing ones
33100 git-ls-remote(1): document --upload-pack
33101 git-blame(1): mention options in the synopsis and advertise pickaxe
33102 gitk(1): expand the manpage to look less like a template
33103 git(7): put the synopsis in a verse style paragraph
33104 gitview.txt: improve asciidoc markup
33105 git-svn(1): improve asciidoc markup
33106 describe: fix off-by-one error in --abbrev=40 handling
33107 Use PATH_MAX instead of MAXPATHLEN
33108 Use xrealloc instead of realloc
33109 Use fstat instead of fseek
33110 Use xcalloc instead of calloc
33111 Add --relative-date option to the revision interface
33112 git(7): move gitk(1) to the list of porcelain commands
33113 Use xmalloc instead of malloc
33114 Include config.mak.autogen in the doc Makefile
33115 git-rev-list(1): group options; reformat; document more options
33116 git-apply(1): document --unidiff-zero
33117 git-repack(1): document --window and --depth
33118 Fix trivial typos and inconsistencies in hooks documentation
33119 gitk(1): mention --all
33121 Junio C Hamano (125):
33122 Perl interface: add build-time configuration to allow building with -fPIC
33123 Perl interface: make testsuite work again.
33124 perl: fix make clean
33125 Git.pm: tentative fix to test the freshly built Git.pm
33126 Perly Git: arrange include path settings properly.
33127 Makefile: Set USE_PIC on x86-64
33128 Perly git: work around buggy make implementations.
33129 Git.pm: clean generated files.
33130 Perly Git: make sure we do test the freshly built one.
33131 INSTALL: a tip for running after building but without installing.
33132 Work around sed and make interactions on the backslash at the end of line.
33133 upload-pack: use object pointer not copy of sha1 to keep track of has/needs.
33134 upload-pack: lift MAX_NEEDS and MAX_HAS limitation
33135 recur vs recursive: help testing without touching too many stuff.
33136 sha1_file.c: expose map_sha1_file() interface.
33137 pack-objects: reuse deflated data from new-style loose objects.
33138 unpack-objects: read configuration data upon startup.
33139 Makefile: git-merge-recur depends on xdiff libraries.
33140 gitweb: There can be more than two levels of subdirectories
33141 gitweb: an obvious cut and paste error.
33142 gitweb: fix use of uninitialized value.
33143 gitweb: when showing history of a tree, show tree link not blob
33144 gitweb: avoid undefined value warning in print_page_path
33145 gitweb/README: do not bug Kay with gitweb questions anymore
33146 Makefile: gitweb/gitweb.cgi is now generated.
33147 gitweb: do not use @@FOO@@ for replaced tokens
33148 .gitignore: git-merge-recur is a built file.
33149 Make git-checkout-index a builtin
33150 builtins: Makefile clean-up
33151 git.c: Rename NEEDS_PREFIX to RUN_SETUP
33152 autoconf: fix NEEDS_SSL_WITH_CRYPTO
33154 Racy git: avoid having to be always too careful
33155 read-cache: tweak racy-git delay logic
33156 autoconf: clean temporary file mak.append
33157 git-grep: show pathnames relative to the current directory
33158 upload-pack: minor clean-up in multi-ack logic
33159 Fix type of combine-diff.c::show_patch_diff()
33160 Remove combine-diff.c::uninteresting()
33161 t4116 apply --reverse test
33162 git-apply --reverse: simplify reverse option.
33163 git-apply --binary: clean up and prepare for --reverse
33165 Documentation/technical/racy-git.txt
33166 Add check program "git-check-racy"
33167 Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
33168 builtin-grep: remove unused debugging cruft.
33169 builtin-apply --reverse: two bugfixes.
33170 diff.c: make binary patch reversible.
33171 apply --reverse: tie it all together.
33173 git-apply --reject: send rejects to .rej files.
33174 git-apply --verbose
33175 apply --reject: count hunks starting from 1, not 0
33176 Convert memset(hash,0,20) to hashclr(hash).
33177 hashcpy/hashcmp remaining bits.
33178 builtin-grep.c: remove unused debugging piece.
33180 git-apply --reject: finishing touches.
33181 free(NULL) is perfectly valid.
33182 daemon: prepare for multiple services.
33183 daemon: add upload-tar service.
33184 multi-service daemon: documentation
33185 t5710: fix two thinkos.
33186 Constness tightening for move/link_temp_to_file()
33187 consolidate two copies of new style object header parsing code.
33188 pack-objects: re-validate data we copy from elsewhere.
33189 Revert "Convert git-annotate to use Git.pm"
33190 Revert "Git.pm: Introduce fast get_object() method"
33191 Revert "Make it possible to set up libgit directly (instead of from the environment)"
33192 pack-objects: fix thinko in revalidate code
33193 more lightweight revalidation while reusing deflated stream in packing
33194 unpack-objects desperately salvages objects from a corrupt pack
33195 revision.c: allow injecting revision parameters after setup_revisions().
33196 Teach rev-list an option to read revs from the standard input.
33197 Revert "daemon: add upload-tar service."
33198 Make apply --binary a no-op.
33199 diff --binary generates full index on binary files.
33200 Separate object listing routines out of rev-list
33201 pack-objects: run rev-list equivalent internally.
33202 pack-objects: further work on internal rev-list logic.
33203 pack-objects --unpacked=<existing pack> option.
33204 get_sha1_hex() micro-optimization
33205 archive: allow remote to have more formats than we understand.
33206 Move sideband client side support into reusable form.
33207 Move sideband server side support into reusable form.
33208 archive: force line buffered output to stderr
33209 Add --verbose to git-archive
33210 Teach --exec to git-archive --remote
33211 Prepare larger packet buffer for upload-pack protocol.
33212 Add sideband status report to git-archive protocol
33213 upload-archive: monitor child communication more carefully.
33214 builtin-archive.c: rename remote_request() to extract_remote_arg()
33215 pack-objects: document --revs, --unpacked and --all.
33216 http-fetch: fix alternates handling.
33217 unpack-objects -r: call it "recover".
33218 Document git-grep -[Hh]
33219 Define fallback PATH_MAX on systems that do not define one in <limits.h>
33220 Fix git-am safety checks
33221 http-fetch.c: consolidate code to detect missing fetch target
33222 Add ftp:// protocol support for git-http-fetch
33223 t1400: make test debuggable.
33224 apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches
33225 builtin-grep: make pieces of it available as library.
33226 revision traversal: prepare for commit log match.
33227 revision traversal: --author, --committer, and --grep.
33228 repack: use only pack-objects, not rev-list.
33229 Update grep internal for grepping only in head/body
33230 git log: Unify header_filter and message_filter into one.
33231 Make hexval() available to others.
33232 sha1_name.c: understand "describe" output as a valid object name
33233 diff.c: second war on whitespace.
33234 git-apply: second war on whitespace.
33235 Add t5510 to test per branch configuration affecting git-fetch.
33236 Remove upload-tar and make git-tar-tree a thin wrapper to git-archive
33237 Deprecate merge-recursive.py
33238 diff --stat: allow custom diffstat output width.
33239 diff --stat: color output.
33240 An illustration of rev-list --parents --pretty=raw
33241 grep: free expressions and patterns when done.
33242 grep: fix --fixed-strings combined with expression.
33243 Contributed bash completion support for core Git tools.
33244 git-diff -B output fix.
33245 Remove -fPIC which was only needed for Git.xs
33248 Linus Torvalds (10):
33249 Relative timestamps in git log
33250 git-fsck-objects: lacking default references should not be fatal
33251 Fix git-fsck-objects SIGSEGV/divide-by-zero
33252 Add "-h/-H" parsing to "git grep"
33253 Allow multiple "git_path()" uses
33254 git-log --author and --committer are not left-anchored by default
33255 Clean up approxidate() in preparation for fixes
33256 Fix approxidate() to understand more extended numbers
33257 diff --stat=width[,name-width]: allow custom diffstat output width.
33258 Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
33261 Fix duplicate xmalloc in builtin-add
33264 gitweb: git_tree displays blame based on repository config
33265 gitweb: bugfix: git_commit and git_commitdiff parents
33266 gitweb: blame table row no highlight fix
33267 gitweb: bugfix: commitdiff regression
33268 gitweb: bugfix: git_print_page_path() needs the hash base
33269 gitweb: tree view: eliminate redundant "blob"
33270 gitweb: Remove redundant "tree" link
33271 gitweb: extend blame to show links to diff and previous
33272 Revert "gitweb: extend blame to show links to diff and previous"
33273 gitweb: Remove excessively redundant entries from git_difftree_body
33274 gitweb: Add history and blame to git_difftree_body()
33275 gitweb: "alternate" starts with shade (i.e. 1)
33276 gitweb: Remove redundant "commit" link from shortlog
33277 gitweb: Factor out gitweb_have_snapshot()
33278 gitweb: Add snapshot to shortlog
33279 gitweb: Don't use quotemeta on internally generated strings
33280 gitweb: Remove redundant "commit" from history
33281 gitweb: History: blob and tree are first, then commitdiff, etc
33282 gitweb: tree view: hash_base and hash are now context sensitive
33284 Martin Langhoff (1):
33285 git-repack: create new packs inside $GIT_DIR, not cwd
33288 gitweb: fill in gitweb configuration by Makefile
33289 gitweb: use out-of-line GIT logo.
33290 gitweb: provide function to format the URL for an action link.
33291 gitweb: consolidate action URL generation.
33292 gitweb: continue consolidation of URL generation.
33293 gitweb: support for "fp" parameter.
33294 gitweb: support for / as home_link.
33295 gitweb: fix project list if PATH_INFO=="/".
33296 gitweb: more support for PATH_INFO based URLs
33297 gitweb: fix uninitialized variable warning.
33298 gitweb: fix display of trees via PATH_INFO.
33300 Matthias Kestenholz (6):
33301 Make git-name-rev a builtin
33302 Make git-pack-objects a builtin
33303 Make git-unpack-objects a builtin
33304 Make git-symbolic-ref a builtin
33305 Add gitweb.cgi to .gitignore
33306 Check if pack directory exists prior to descending into it
33308 Matthias Lederhofer (12):
33309 pager: environment variable GIT_PAGER to override PAGER
33310 gitweb: use a hash to lookup the sub for an action
33311 gitweb: require $ENV{'GITWEB_CONFIG'}
33312 gitweb: check if HTTP_ACCEPT is really set
33313 gitweb: fix commitdiff_plain for root commits
33314 gitweb: fix $project usage
33315 gitweb: do not use 'No such directory' error message
33316 gitweb: export options
33317 gitweb: fix warnings in PATH_INFO code and add export_ok/strict_export
33318 gitweb fix validating pg (page) parameter
33319 format-patch: use cwd as default output directory
33320 git-format-patch: fix bug using -o in subdirectories
33323 move pack creation to version 3
33324 many cleanups to sha1_file.c
33326 Paul Mackerras (10):
33327 gitk: Minor cleanups
33328 gitk: Recompute ancestor/descendent heads/tags when rereading refs
33329 gitk: Add a row context-menu item for creating a new branch
33330 gitk: Add a context menu for heads
33331 gitk: Fix a couple of buglets in the branch head menu items
33332 gitk: Add a menu item for cherry-picking commits
33333 gitk: Update preceding/following tag info when creating a tag
33334 gitk: Improve responsiveness while reading and layout out the graph
33335 gitk: Fix some bugs in the new cherry-picking code
33336 diff-index --cc shows a 3-way diff between HEAD, index and working tree.
33339 Fix probing for already installed Error.pm
33340 Delete manuals if compiling without docs
33341 Make perl interface a separate package
33344 Introduce Git.pm (v4)
33345 Git.pm: Implement Git::exec_path()
33346 Git.pm: Call external commands using execv_git_cmd()
33347 Git.pm: Implement Git::version()
33348 Add Error.pm to the distribution
33349 Git.pm: Better error handling
33350 Git.pm: Handle failed commands' output
33351 Git.pm: Enhance the command_pipe() mechanism
33352 Git.pm: Implement options for the command interface
33353 Git.pm: Add support for subdirectories inside of working copies
33354 Convert git-mv to use Git.pm
33355 Git.pm: assorted build related fixes.
33356 Git.pm: Try to support ActiveState output pipe
33357 Git.pm: Swap hash_object() parameters
33358 Git.pm: Fix Git->repository("/somewhere/totally/elsewhere")
33359 Git.pm: Support for perl/ being built by a different compiler
33360 Git.pm: Remove PerlIO usage from Git.xs
33361 Git.pm: Avoid ppport.h
33362 Git.pm: Don't #define around die
33363 Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging
33364 Git.pm: Add config() method
33365 Convert git-send-email to use Git.pm
33366 Git.pm: Introduce ident() and ident_person() methods
33367 Make it possible to set up libgit directly (instead of from the environment)
33368 Git.pm: Introduce fast get_object() method
33369 Convert git-annotate to use Git.pm
33370 Eliminate Scalar::Util usage from private-Error.pm
33371 Fix showing of path in tree view
33372 gitweb: Link (HEAD) tree for each project from projects list
33373 gitweb: More per-view navigation bar links
33374 gitweb: Link to tree instead of snapshot in shortlog
33375 gitweb: Link to latest tree from the head line in heads list
33376 gitweb: Link to associated tree from a particular log item in full log view
33377 gitweb: Rename "plain" labels to "raw"
33378 gitweb: Relabel "head" as "HEAD"
33379 Make path in tree view look nicer
33380 gitweb: Fix tree link associated with each commit log entry.
33381 gitweb: Fix @git_base_url_list usage
33382 Fix snapshot link in tree view
33383 Git.pm: Kill Git.xs for now
33384 Deprecate git-resolve.sh
33385 gitweb: Consolidate escaping/validation of query string
33386 gitweb: fix over-eager application of esc_html().
33388 Pierre Habouzit (7):
33389 Fix a comparison bug in diff-delta.c
33390 avoid to use error that shadows the function name, use err instead.
33391 git_dir holds pointers to local strings, hence MUST be const.
33392 missing 'static' keywords
33393 remove ugly shadowing of loop indexes in subloops.
33394 use name[len] in switch directly, instead of creating a shadowed variable.
33395 n is in fact unused, and is later shadowed.
33397 Randal L. Schwartz (1):
33398 builtin-upload-archive.c broken on openbsd
33401 git-verify-pack: make builtin
33403 Add write_or_die(), a helper function
33405 git-cherry: remove unused variable
33406 git-reset: remove unused variable
33407 Add git-zip-tree to .gitignore
33408 git-archive: make compression level of ZIP archives configurable
33409 Use xstrdup instead of strdup in builtin-{tar,zip}-tree.c
33410 git-archive: inline default_parse_extra()
33411 git-tar-tree: devolve git-tar-tree into a wrapper for git-archive
33412 Remove git-zip-tree
33413 Rename builtin-zip-tree.c to archive-zip.c
33414 git-tar-tree: Remove duplicate git_config() call
33415 git-tar-tree: Move code for git-archive --format=tar to archive-tar.c
33417 Robin Rosenberg (2):
33418 Quote arguments to tr in test-lib
33419 Make cvsexportcommit remove files.
33422 Fetch: default remote repository from branch properties
33423 fetch: get the remote branches to merge from the branch properties
33424 Add test for the default merges in fetch.
33425 fetch: Reset remote refs list each time fetch_main is called
33427 Sasha Khapyorsky (3):
33428 Trivial support for cloning and fetching via ftp://.
33429 git-svnimport: Parse log message for Signed-off-by: lines
33430 http/ftp: optionally ask curl to not use EPSV command
33433 Documentation: Fix howto/revert-branch-rebase.html generation
33434 git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
33436 Shawn O. Pearce (15):
33437 Verify we know how to read a pack before trying to using it.
33438 Remove unnecessary forward declaration of unpack_entry.
33439 Convert memcpy(a,b,20) to hashcpy(a,b).
33440 Convert memcpy(a,b,20) to hashcpy(a,b).
33441 Reorganize/rename unpack_non_delta_entry to unpack_compressed_entry.
33442 Reuse compression code in unpack_compressed_entry.
33443 Cleanup unpack_entry_gently and friends to use type_name array.
33444 Cleanup unpack_object_header to use only offsets.
33445 Convert unpack_entry_gently and friends to use offsets.
33446 Replace uses of strdup with xstrdup.
33447 Allow 'svn fetch' on '(no date)' revisions in Subversion.
33448 Allow '(no author)' in git-svn's authors file.
33449 Ignore executable bit when adding files if filemode=0.
33450 Allow git-checkout when on a non-existant branch.
33451 Corrected copy-and-paste thinko in ignore executable bit test case.
33453 Tilman Sauerbeck (2):
33455 Added support for dropping privileges to git-daemon.
33458 --name-only, --name-status, --check and -s are mutually exclusive
33459 Remove awkward compatibility warts
33462 Be nicer if git executable is not installed
33465 gitweb: configurable home link string
33466 gitweb: Decode long title for link tooltips
33469 Version v1.4.2.4; changes since v1.4.2.3:
33470 -----------------------------------------
33472 Linus Torvalds (1):
33473 Fix hash function in xdiff library
33476 Version v1.4.2.3; changes since v1.4.2.2:
33477 -----------------------------------------
33479 Junio C Hamano (2):
33480 git-mv: invalidate the removed path properly in cache-tree
33481 git-push: .git/remotes/ file does not require SP after colon
33484 Version v1.4.2.2; changes since v1.4.2.1:
33485 -----------------------------------------
33487 Junio C Hamano (2):
33488 Fix git-am safety checks
33489 git-diff -B output fix.
33492 Fix duplicate xmalloc in builtin-add
33495 Version v1.4.2.1; changes since v1.4.2:
33496 ---------------------------------------
33498 Dennis Stosberg (1):
33499 Solaris does not support C99 format strings before version 10
33501 Johannes Schindelin (5):
33502 git-mv: succeed even if source is a prefix of destination
33503 git-mv: add more path normalization
33504 git-mv: special case destination "."
33505 git-mv: fix off-by-one error
33506 builtin-mv: readability patch
33508 Junio C Hamano (2):
33509 finish_connect(): thinkofix
33510 http-fetch: fix alternates handling.
33513 Fix regex pattern in commit-msg
33514 sample commit-msg hook: no silent exit on duplicate Signed-off-by lines
33517 Version v1.4.2; changes since v1.4.2-rc4:
33518 -----------------------------------------
33521 git-svn: correctly kill keyword expansion without munging EOLs
33522 git-svn: bugfix: allow SVN:: lib users to track the root of the repository
33523 git-svn: split the path from the url correctly with limited perms
33525 Junio C Hamano (8):
33526 git-apply: applying a patch to make a symlink shorter.
33527 combine-diff: use color
33529 builtin-apply: remove unused increment
33530 git-sh-setup: do not use repo-config to test the git directory
33531 git-am: give better diagnostics when the patch does not apply during --3way
33532 Better error message when we are unable to lock the index file
33533 t/t4013: fix futzing with the version string.
33535 Matthias Lederhofer (1):
33536 upload-pack: fix timeout in create_pack_file
33538 Paul Mackerras (2):
33539 gitk: Allow the user to set some colors
33540 gitk: Show the currently checked-out head in bold font
33542 Ramsay Allan Jones (1):
33543 Fix header breakage with _XOPEN_SOURCE.
33546 Add has_extension()
33547 git-verify-pack: show usage when no pack was specified
33548 git-verify-pack: more careful path handling
33549 git-verify-pack: insist on .idx extension
33550 git-verify-pack: get rid of while loop
33551 git-verify-pack: free pack after use and a cleanup
33552 git-verify-pack: buffer overrun paranoia
33553 git-verify-pack: no need to count errors
33554 drop length argument of has_extension
33556 Rutger Nijlunsing (2):
33557 http-push: Make WebDAV work with (broken?) default apache2 WebDAV module
33558 Add Documentation/howto/setup-git-server-over-http.txt
33561 Version v1.4.2-rc4; changes since v1.4.2-rc3:
33562 ---------------------------------------------
33565 git-push: allow pushing from subdirectories
33567 Johannes Schindelin (1):
33568 Fix crash when GIT_DIR is invalid
33571 Update git-init-db(1) and documentation of core.sharedRepository
33573 Junio C Hamano (13):
33574 Cygwin needs NO_C99_FORMAT???
33575 Further clean-up: usage() vs die()
33576 Makefile: Cygwin does not seem to need NO_STRLCPY
33578 debugging: XMALLOC_POISON
33579 builtin-mv: fix use of uninitialized memory.
33580 GIT-VERSION-GEN: adjust for ancient git
33581 Documentation: git-status takes the same options as git-commit
33582 Fix tutorial-2.html
33583 check return value from diff_setup_done()
33584 find_unique_abbrev() with len=0 should not abbreviate
33585 make --find-copies-harder imply -C
33586 allow diff.renamelimit to be set regardless of -M/-C
33588 Michael Krelin (1):
33589 handle https:// protocol in git-clone
33591 Ramsay Allan Jones (4):
33592 Fixup command names in some usage strings.
33593 Replace some calls to die(usage_str) with usage(usage_str).
33594 Allow config file to specify Signed-off-by identity in format-patch.
33595 commit walkers: setup_ident() to record correct committer in ref-log.
33598 git-tar-tree: fix minor memory leak
33601 log-tree: show_log() should respect the setting of diffopt->line_termination
33602 annotate: Fix bug when parsing merges with differing real and logical parents.
33604 Uwe Kleine-König (1):
33605 Document rev-list's option --merge
33608 Version v1.4.2-rc3; changes since v1.4.2-rc2:
33609 ---------------------------------------------
33612 Build on Debian GNU/kFreeBSD
33614 Jakub Narębski (11):
33615 Allow INSTALL, bindir, mandir to be set in main Makefile
33616 Rename man1 and man7 variables to man1dir and man7dir
33617 autoconf: Use autoconf to write installation directories to config.mak.autogen
33618 Teach make clean about configure and autoconf
33619 Copy description of build configuration variables to configure.ac
33620 autoconf: Preparing the way for autodetection
33621 autoconf: Checks for typedefs, structures, and compiler characteristics.
33622 autoconf: Checks for some library functions.
33623 autoconf: Checks for libraries
33624 autoconf: Checks for some programs
33625 configure.ac vertical whitespace usage cleanup
33628 git-push: allow -f as an alias for --force
33629 git-push: remove obsolete git-push.sh
33630 Documentation: convert uses of git-link macro to gitlink
33631 git-annotate: remove extraneous debugging line
33633 Johannes Schindelin (16):
33634 Allow an alias to start with "-p"
33635 git wrapper: add --git-dir=<path> and --bare options
33636 git-instaweb: some Apache have mod_cgi builtin
33637 git-instaweb: respect bindir from Makefile
33638 gitweb: fix two warnings
33639 t7001: add test for git-mv dir1 dir2/
33640 git-cvsserver: support multiline commit messages
33641 Extract helper bits from c-merge-recursive work
33642 Make git-mv a builtin
33643 builtin git-mv: support moving directories
33644 instaweb: Be more clear if httpd or the browser fail
33645 cvsserver: imitate git-update-ref when committing
33646 Makefile: ssh-pull.o depends on ssh-fetch.c
33647 Teach git-apply about '-R'
33649 tar-tree: illustrate an obscure feature better
33651 Josef Weidendorfer (1):
33652 Extend testing git-mv for renaming of subdirectories
33654 Junio C Hamano (18):
33655 git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"
33656 t4112: simplify the test and remove unneeded working tree file.
33657 lost-found: use fsck-objects --full
33658 git-reset: detect update-ref error and report it.
33659 log and diff family: honor config even from subdirectories
33660 git-apply -R: binary patches are irreversible for now.
33661 t4103: fix binary patch application test.
33662 git-checkout: allow "checkout HEAD -- path"
33663 Builtins: control the use of pager from the command table.
33664 fetch/clone: mark messages from remote side stand out.
33665 Fix "git diff blob1 blob2" showing the diff in reverse.
33666 read-tree: shadowed variable fix.
33667 Add a couple of subdirectory tests.
33668 diff.c: do not use pathname comparison to tell renames
33669 Show both blob names from "git diff blob1 blob2"
33670 sideband: do not use color, just say "remote:"
33671 Documentation/git.txt: link git-svn and git-instaweb from the main page.
33674 Linus Torvalds (4):
33675 Call setup_git_directory() early
33676 Call setup_git_directory() much earlier
33677 Fix double "close()" in ce_compare_data
33678 Fix up some fallout from "setup_git_directory()" cleanups
33681 gitweb.cgi: Teach git_history() to read hash from $hash_base
33682 gitweb.cgi: Include direct link to "raw" files from "history"
33683 gitweb.cgi: git_blame2: an alternative simple working git blame
33684 gitweb.cgi: git_blame2: Allow back-trekking through commits
33685 gitweb.cgi: Show "raw" head of project link even when $hash is not defined
33686 gitweb.cgi: git_blame2: Revision blocks now have alternating colors
33687 gitweb.cgi: Centralize printing of the page path
33688 gitweb.cgi: git_blame2: slight optimization reading the blame lines
33690 Matthias Kestenholz (3):
33691 Make git-prune-packed a builtin
33692 Make git-repo-config a builtin
33693 use declarations from builtin.h for builtin commands
33695 Matthias Lederhofer (5):
33696 daemon: documentation for --reuseaddr, --detach and --pid-file
33697 setup_git_directory_gently: do not barf when GIT_DIR is given.
33698 git.c: allow alias expansion without a git directory
33699 pager: config variable pager.color
33700 git-grep: document --and, --or, --not, ( and )
33702 Michael S. Tsirkin (1):
33703 mailinfo: accept >From in message header
33705 Michele Ballabio (1):
33706 fixed variable declaration in gitk
33709 Typofix in configure.ac comment.
33710 Quote all calls to GIT_CONF_APPEND_LINE
33711 Set datarootdir in config.mak.in
33714 Remove -d from *-fetch usage strings
33715 Make pull() take some implicit data as explicit arguments
33716 Make pull() support fetching multiple targets at once
33717 Teach git-local-fetch the --stdin switch
33718 Teach git-http-fetch the --stdin switch
33720 Ramsay Allan Jones (7):
33721 Ensure git-clone exits with error if perl script fails.
33722 Fix annotate test script; notice when git-annotate fails.
33723 Fix installation of templates on ancient systems.
33724 New tests and en-passant modifications to mktag.
33725 Add NO_C99_FORMAT to support older compilers.
33726 Fix header breakage due to redefining PATH_MAX.
33727 Remove cmd_usage() routine and re-organize the help/usage code.
33729 Robert Shearman (2):
33730 rebase: Fix the detection of fast-forwarding of the current branch to upstream.
33731 rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.
33733 Shawn O. Pearce (1):
33734 Display an error from update-ref if target ref name is invalid.
33737 Version v1.4.2-rc2; changes since v1.4.2-rc1:
33738 ---------------------------------------------
33741 Trivial path optimization test
33743 Alexandre Julliard (5):
33744 git.el: Run git-rerere on commits if the rr-cache directory exists.
33745 git.el: Prepend a slash to the file name when adding to .gitignore.
33746 git.el: Try to reuse an existing buffer when running git-status.
33747 git.el: Put the git customize group in the 'tools' parent group.
33748 show-branch: Fix another performance problem.
33751 gitweb: escape tag comments
33754 typechange tests for git apply (currently failing)
33755 git-svn: fix fetching new directories copies when using SVN:: libs
33758 pack-objects: check pack.window for default window size
33759 Colorize 'commit' lines in log ui
33761 Johannes Schindelin (4):
33762 Fix t4114 on cygwin
33763 Always reset the color _before_ printing out the newline
33764 cvsserver: suppress warnings
33765 cvsserver: avoid warning about active db handles
33768 git-format-patch: Make the second and subsequent mails replies to the first
33769 Add option to enable threading headers
33770 Add option to set initial In-Reply-To/References
33772 Junio C Hamano (8):
33773 fetch/clone: check return status from ls-remote
33774 builtin-log: typefix for recent format-patch changes.
33775 checkout -f failed to check out a file if an existing directory interfered.
33776 apply: check D/F conflicts more carefully.
33777 apply: split out removal and creation into different phases.
33778 apply: handle type-changing patch correctly.
33779 git-fetch: fix --keep vs --thin
33780 unpack-objects: remove stale and confusing comment
33782 Linus Torvalds (1):
33783 sha1_file: add the ability to parse objects in "pack file format"
33785 Lukas Sandström (1):
33786 git-am: Don't accept an mbox on stdin of we already have a .dotest directory
33788 Martin Langhoff (1):
33789 cvsexportcommit - add -a (add author line) flag, cleanup warnings
33791 Matthias Lederhofer (1):
33792 upload-pack: fix timeout in create_pack_file
33795 Substitute xmalloc()+memset(0) with xcalloc().
33798 Defaulting fetch to origin when set in the repo-config
33800 Shawn O. Pearce (1):
33801 Disable linking with Fink or DarwinPorts.
33804 tar-tree: add the "tar.umask" config option
33807 Version v1.4.2-rc1; changes since v1.4.1.1:
33808 -------------------------------------------
33810 A Large Angry SCM (1):
33811 Additional merge-base tests (revised)
33814 Do not use perl in git-commit.sh
33817 Fix some doubled word typos
33818 Fix some doubled word typos
33819 Fix typos involving the word 'commit'
33820 typofix (git-name-rev documentation)
33821 git-send-email: Remove redundant Reply-To header
33822 gitweb: Send XHTML as 'application/xhtml+xml' where possible
33823 gitweb: Include a site name in page titles
33824 gitweb: Make command invocations go through the git wrapper
33825 documentation (urls.txt) typofix
33827 Dennis Stosberg (2):
33828 gitweb: Declare global variables with "our"
33829 gitweb: Declare global variables with "our"
33832 Add git-instaweb, instantly browse the working repo with gitweb
33833 instaweb: fix unportable ';' usage in sed
33834 t8001-annotate: fix a bash-ism in this test
33835 git-svn: avoid fetching files outside of the URL we're tracking
33836 git-svn: migrate out of contrib
33837 builtin-log: respect diff configuration options
33838 diff.c: respect diff.renames config option
33839 templates/hooks--update: replace diffstat calls with git diff --stat
33840 git-svn: fix --file/-F option in commit-diff
33841 tests: Set EDITOR=: and VISUAL=: globally
33842 git-fetch: fix a bashism (==)
33843 git-svn: don't check for migrations/upgrades on commit-diff
33845 Jakub Narębski (3):
33846 send-email: format 2822 datestring ourselves.
33847 Wrap long lines in docstrings in contrib/emacs/git.el
33848 Display help for Git mode after pressing `h' or `?' in *git-status*
33850 Joachim Berdal Haga (2):
33851 Make zlib compression level configurable, and change default.
33852 core.compression documentation formatting fix.
33854 Johannes Schindelin (7):
33855 refactor merge_bases() as preparation to libify merge-base
33856 move get_merge_bases() to core lib.
33857 Makefile: replace ugly and unportable sed invocation
33858 Make git-fmt-merge-msg a builtin
33859 Makefile: export NO_SVN_TESTS
33860 Close the index file between writing and committing
33861 Fix linking for not-so-clever linkers.
33864 Documentation/urls.txt: Use substitution to escape square brackets
33866 Junio C Hamano (49):
33867 Makefile: add framework to verify and bench sha1 implementations.
33868 test-sha1: test hashing large buffer
33869 t4013: add tests for diff/log family output options.
33870 t4013: add more tests around -c and --cc
33871 Fix some more diff options changes.
33872 t4013 test updates for new output code.
33873 combine-diff.c: type sanity.
33874 format-patch: fix diff format option implementation
33875 t4013: add format-patch tests.
33876 t4013: note improvements brought by the new output code.
33877 gitweb: optimize per-file history generation
33878 gitweb: optimize per-file history generation
33879 t4013: add "diff" UI program tests.
33880 builtin-diff: turn recursive on when defaulting to --patch format.
33881 commit.c: do not redefine UNINTERESTING bit.
33882 get_merge_bases: clean up even when there is no common commit.
33883 revert clear-commit-marks for now.
33884 boolean: accept yes and no as well
33885 send-email: do not barf when Term::ReadLine does not like your terminal
33886 t6200: fmt-merge-msg test.
33887 git-grep: fix parsing of pathspec separator '--'
33888 git-grep: fix exit code when we use external grep.
33889 git-grep: use a bit more specific error messages.
33890 Re-fix clear_commit_marks().
33891 git-grep: boolean expression on pattern matching.
33892 git-reset: complain and exit upon seeing an unknown parameter.
33893 mailinfo: assume input is latin-1 on the header as we do for the body
33894 diffcore-rename: try matching up renames without populating filespec first.
33895 builtin-rev-parse.c: constness tightening
33896 show-branch: match documentation and usage
33897 rev-parse documentation: talk about range notation.
33898 git-svn: migrate out of contrib (follow-up)
33899 diff.c: --no-color to defeat diff.color configuration.
33900 Update diff-options and config documentation.
33901 git log -p --merge [[--] paths...]
33902 colored diff: diff.color = auto fix
33903 diff: do not use configuration magic at the core-level
33904 "git -p cmd" to page anywhere
33905 merge-base: update the clean-up postprocessing
33907 Fix grammatical error in git-revert
33908 git-repack: avoid redirecting stderr into git-pack-objects
33909 test-lib: unset GIT_TRACE
33910 t4013 diff format tests update
33911 Adjust t4013 tests to corrected format-patch.
33912 Documentation: Fix ssh://[user@]host.xz URL
33913 builtin-prune.c: forgot TYPE => OBJ changes.
33914 Documentation/Makefile: product depends on asciidoc.conf
33915 show-branch: fix performance problem.
33917 Linus Torvalds (7):
33918 xdiff: generate "anti-diffs" aka what is common to two files
33919 Prepare "git-merge-tree" for future work
33920 Improved three-way blob merging code
33921 Improve git-peek-remote
33922 builtin "git prune"
33923 Make the unpacked object header functions static to sha1_file.c
33924 Remove TYPE_* constant macros and use object_type enums consistently.
33927 gitweb: Enable tree (directory) history display
33928 gitweb: Enable tree (directory) history display
33929 Add "raw" output option to blobs in "tree" view format
33930 gitweb.cgi: Create $git_temp if it doesn't exist
33931 gitweb.cgi: Teach "a=blob" action to know the blob/file mime type
33932 gitweb.css: Use monospace fonts for commits and tree-diff.
33934 Matthias Lederhofer (10):
33935 GIT_TRACE: show which built-in/external commands are executed
33936 change ent to tree in git-diff documentation
33937 git-rev-list: add documentation for --parents, --no-merges
33938 daemon: use a custom die routine with syslog
33939 daemon: if one of the standard fds is missing open it to /dev/null
33940 upload-pack: ignore write errors to stderr
33941 daemon: new option --pid-file=<path> to store the pid
33942 daemon: new option --detach to run git-daemon in background
33943 Documentation about exclude/ignore files
33944 argv created by handle_alias should be NULL terminated
33947 sed -e '/RE/r rfile/' needs space in 'r rfile'
33948 Using 'perl' in *.sh
33951 Assorted typo fixes
33952 Typofix in Makefile comment.
33953 Fix more typos, primarily in the code
33954 Avoid C99 comments, use old-style C comments instead.
33957 git-cvsexportcommit can't handle merge commits correctly
33960 Add get_merge_bases_clean()
33961 Add '...' operator for revisions
33962 Make clear_commit_marks() clean harder
33963 Fold get_merge_bases_clean() into get_merge_bases()
33964 rev-list: free commit_list in ... handler
33966 Robert Shearman (1):
33967 format-patch: Generate a newline between the subject header and the message body
33970 annotate: Support annotation of files on other revisions.
33971 annotate: Correct most merge following to annotate correctly.
33972 Disable color detection during format-patch
33975 Teach rev-parse the ... syntax.
33978 Fix "git-fetch --tags" exit status when nothing has been changed
33980 Shawn O. Pearce (9):
33981 Avoid C99 initializers
33982 Allow user.name and user.email to drive reflog entry.
33983 Record the type of commit operation in the reflog.
33984 Log ref changes made by git-fetch and git-pull.
33985 Log ref changes made by git-merge and git-pull.
33986 Log ref changes made by quiltimport.
33987 Log ref changes made by resolve.
33988 Make lazy mkdir more robust.
33989 Record rebase changes as 'rebase' in the reflog.
33992 Do not drop data from '\0' until eol in patch output
33993 Teach --text option to diff
33994 Teach diff -a as shorthand for --text
33995 Add -a and --text to common diff options help
33996 diff-options: Explain --text and -a
33998 Timo Hirvonen (14):
33999 Merge with_raw, with_stat and summary variables to output_format
34000 Make --raw option available for all diff commands
34001 Set default diff output format after parsing command line
34002 DIFF_FORMAT_RAW is not default anymore
34003 Add msg_sep to diff_options
34004 Don't xcalloc() struct diffstat_t
34005 whatchanged: Default to DIFF_FORMAT_RAW
34006 Print empty line between raw, stat, summary and patch
34007 diff-tree: Use ---\n as a message separator
34008 log --raw: Don't descend into subdirectories by default
34010 GIT_TRACE: fix a mixed declarations and code warning
34011 diff: Support both attributes and colors
34012 diff: Support 256 colors
34015 Fix print-log and diff compatibility with recent vc versions
34018 Mention the [user@] part in documentation of ssh:// urls.
34021 A better-scheduled PPC SHA-1 implementation.
34024 Version v1.4.1.1; changes since v1.4.1:
34025 ---------------------------------------
34027 Junio C Hamano (1):
34028 Makefile: tighten git-http-{fetch,push} dependencies
34030 Linus Torvalds (1):
34031 revision.c: fix "dense" under --remove-empty
34033 Matthias Lederhofer (1):
34034 upload-pack: fix timeout in create_pack_file
34036 Robin Rosenberg (1):
34037 Empty author may be presented by svn as an empty string or a null value.
34040 Version v1.4.1; changes since v1.4.1-rc2:
34041 -----------------------------------------
34044 git-svn: allow a local target directory to be specified for init
34046 Johannes Schindelin (4):
34047 add diff_flush_patch_id() to calculate the patch id
34048 format-patch: introduce "--ignore-if-in-upstream"
34049 t4014: fix for whitespace from "wc -l"
34050 format-patch: use clear_commit_marks() instead of some ad-hockery
34052 Junio C Hamano (6):
34053 git-repack: Be careful when updating the same pack as an existing one.
34054 t4014: add format-patch --ignore-if-in-upstream test
34055 t4014: fix test commit labels.
34056 diff.c: fix get_patch_id()
34058 upload-pack.c: <sys/poll.h> includes <ctype.h> on OpenBSD 3.8
34060 Linus Torvalds (4):
34061 Do not try futile object pairs when repacking.
34062 Abstract out accesses to object hash array
34063 revision.c: --full-history fix.
34064 git object hash cleanups
34067 consider previous pack undeltified object state only when reusing delta data
34068 don't load objects needlessly when repacking
34071 Fix errno usage in connect.c
34073 Robin Rosenberg (1):
34074 Minor documentation fixup.
34077 Version v1.4.1-rc2; changes since v1.4.1-rc1:
34078 ---------------------------------------------
34080 Andreas Ericsson (1):
34081 git wrapper: fix command name in an error message.
34083 Dennis Stosberg (3):
34084 Solaris needs inclusion of signal.h for signal()
34085 Fix pkt-line.h to compile with a non-GCC compiler
34086 Fix expr usage for FreeBSD
34089 rebase: allow --merge option to handle patches merged upstream
34090 rebase: cleanup rebasing with --merge
34091 rebase: allow --skip to work with --merge
34092 git-svn: SVN 1.1.x library compatibility
34093 git-svn: several graft-branches improvements
34094 git-svn: add the commit-diff command
34095 git-svn: add --follow-parent and --no-metadata options to fetch
34096 git-svn: be verbose by default on fetch/commit, add -q/--quiet option
34097 rebase: get rid of outdated MRESOLVEMSG
34098 rebase: check for errors from git-commit
34101 git-commit: allow -e option anywhere on command line
34102 quote.c: silence compiler warnings from EMIT macro
34104 Johannes Schindelin (5):
34105 patch-id: take "commit" prefix as well as "diff-tree" prefix
34106 Teach diff about -b and -w flags
34107 cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}
34108 apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.
34109 Save errno in handle_alias()
34111 Junio C Hamano (12):
34112 Makefile: do not recompile main programs when libraries have changed.
34113 usage: minimum type fix.
34114 git-pull: abort when fmt-merge-msg fails.
34116 diff --color: use reset sequence when we mean reset.
34117 repo-config: fix printing of bool
34118 diff --color: use $GIT_DIR/config
34119 combine-diff.c: type sanity
34120 connect.c: remove unused parameters from tcp_connect and proxy_connect
34121 connect.c: check the commit buffer boundary while parsing.
34122 t/README: start testing porcelainish
34123 checkout -m: fix read-tree invocation
34125 Linus Torvalds (1):
34128 Martin Langhoff (3):
34129 git-repack -- respect -q and be quiet
34130 cvsimport: setup indexes correctly for ancestors and incremental imports
34131 cvsimport - cleanup of the multi-indexes handling
34133 Matthias Kestenholz (1):
34134 add GIT-CFLAGS to .gitignore
34136 Matthias Lederhofer (1):
34137 correct documentation for git grep
34140 Rename safe_strncpy() to strlcpy().
34143 Customizable error handlers
34146 git-merge: Don't use -p when outputting summary
34148 Make some strings const
34151 git-commit: filter out log message lines only when editor was run.
34154 Version v1.4.1-rc1; changes since v1.4.0:
34155 -----------------------------------------
34158 object-refs: avoid division by zero
34160 David Woodhouse (1):
34161 Log peer address when git-daemon called from inetd
34163 Dennis Stosberg (3):
34164 Make t4101-apply-nonl bring along its patches
34165 Make t8001-annotate and t8002-blame more portable
34166 Fix t8001-annotate and t8002-blame for ActiveState Perl
34168 Eric W. Biederman (3):
34169 Don't parse any headers in the real body of an email message.
34170 Fix git-format-patch -s
34171 Check and document the options to prevent mistakes.
34174 git-svn: t0000: add -f flag to checkout
34175 git-svn: fix handling of filenames with embedded '@'
34176 git-svn: eol_cp corner-case fixes
34177 git-svn: restore original LC_ALL setting (or unset) for commit
34178 git-svn: don't allow commit if svn tree is not current
34179 git-svn: support -C<num> passing to git-diff-tree
34180 git-svn: --branch-all-refs / -B support
34181 git-svn: optimize --branch and --branch-all-ref
34182 git-svn: support manually placed initial trees from fetch
34183 git-svn: Move all git-svn-related paths into $GIT_DIR/svn
34184 git-svn: minor cleanups, extra error-checking
34185 git-svn: add --repack and --repack-flags= options
34186 git-svn: add --shared and --template= options to pass to init-db
34187 git-svn: add some functionality to better support branches in svn
34188 git-svn: add UTF-8 message test
34189 git-svn: add 'log' command, a facsimile of basic `svn log'
34190 git-svn: add support for Perl SVN::* libraries
34191 git-svn: make the $GIT_DIR/svn/*/revs directory obsolete
34192 git-svn: avoid creating some small files
34193 git-svn: fix several small bugs, enable branch optimization
34194 git-svn: Eliminate temp file usage in libsvn_get_file()
34195 git-svn: bugfix and optimize the 'log' command
34196 git-svn: tests no longer fail if LC_ALL is not a UTF-8 locale
34197 git-svn: svn (command-line) 1.0.x compatibility
34198 git-svn: rebuild convenience and bugfixes
34199 git-svn: fix --rmdir when using SVN:: libraries
34200 rebase: Allow merge strategies to be used when rebasing
34201 rebase: error out for NO_PYTHON if they use recursive merge
34202 git-svn: fix commit --edit flag when using SVN:: libraries
34204 Florian Forster (9):
34205 gitweb: Adding a `blame' interface.
34206 gitweb: Make the `blame' interface in gitweb optional.
34207 Remove ranges from switch statements.
34208 Initialize FAMs using `FLEX_ARRAY'.
34209 Don't instantiate structures with FAMs.
34210 Cast pointers to `void *' when used in a format.
34211 Don't use empty structure initializers.
34212 Change types used in bitfields to be `int's.
34213 Remove all void-pointer arithmetic.
34215 Fredrik Kuivinen (1):
34216 blame: Add --time to produce raw timestamps
34218 Jakub Narębski (15):
34219 Update gitweb README: gitweb is now included with git
34220 Move gitweb style to gitweb.css
34221 gitweb: safely output binary files for 'blob_plain' action
34222 gitweb: text files for 'blob_plain' action without charset by default
34223 Fix gitweb stylesheet
34224 Make CSS file gitweb/gitweb.css more readable
34225 gitweb: add type="text/css" to stylesheet link
34226 Fix: Support for the standard mime.types map in gitweb
34227 gitweb: A couple of page title tweaking
34228 gitweb: style done with stylesheet
34229 gitweb: whitespace cleanup
34230 Add git version to gitweb output
34231 Move $gitbin earlier in gitweb.cgi
34232 gitweb: Make use of $PATH_INFO for project parameter
34233 gitweb: whitespace cleanup around '='
34235 Johannes Schindelin (6):
34236 diff options: add --color
34237 Initialize lock_file struct to all zero.
34238 Fix setting config variables with an alternative GIT_CONFIG
34239 Read configuration also from $HOME/.gitconfig
34240 repo-config: Fix late-night bug
34241 git_config: access() returns 0 on success, not > 0
34243 Junio C Hamano (31):
34244 Revert all the rev-list option parsing changes.
34245 Clean-up Geert's similarity fingerprint code.
34246 Extract "log [diff options]" parser out.
34247 whatchanged options parser fix.
34248 Built-in git-whatchanged
34250 Try using Geert similarity code in pack-objects.
34251 Retire rabinpoly fingerprinting code
34252 Fix mismerged update-index from jc/cache-tree branch.
34253 read-tree: --prefix=<path>/ option.
34254 write-tree: --prefix=<path>
34255 read-tree: reorganize bind_merge code.
34256 fetch-pack: give up after getting too many "ack continue"
34257 Fix earlier mismerges.
34258 shared repository: optionally allow reading to "others".
34259 gitk: rereadrefs needs listrefs
34261 t5100: mailinfo and mailsplit tests.
34262 mailinfo: ignore blanks after in-body headers.
34263 fix rfc2047 formatter.
34264 xdiff: minor changes to match libxdiff-0.21
34265 Restore SIGCHLD to SIG_DFL where we care about waitpid().
34266 checkout -f: do not leave untracked working tree files.
34267 upload-pack: avoid sending an incomplete pack upon failure
34268 upload-pack: prepare for sideband message support.
34269 Retire git-clone-pack
34270 upload-pack/fetch-pack: support side-band communication
34271 Add renaming-rebase test.
34272 daemon: send stderr to /dev/null instead of closing.
34273 rebase --merge: fix for rebasing more than 7 commits.
34274 Makefile: do not force unneeded recompilation upon GIT_VERSION changes
34276 Linus Torvalds (9):
34277 Tentative built-in "git show"
34278 gitweb.cgi history not shown
34279 Shrink "struct object" a bit
34280 Move "void *util" from "struct object" into "struct commit"
34281 Some more memory leak avoidance
34282 Remove "refs" field from "struct object"
34283 Add specialized object allocator
34284 Add "named object array" concept
34285 Fix grow_refs_hash()
34287 Lukas Sandström (6):
34288 Make git-write-tree a builtin
34289 Make git-mailsplit a builtin
34290 Make git-mailinfo a builtin
34291 Make git-stripspace a builtin
34292 Make git-update-index a builtin
34293 Make git-update-ref a builtin
34295 Martin Langhoff (3):
34296 cvsimport: ignore CVSPS_NO_BRANCH and impossible branches
34297 cvsimport: complete the cvsps run before starting the import
34298 cvsimport: keep one index per branch during import
34301 date.c: improve guess between timezone offset and year.
34303 Paul Mackerras (1):
34304 Fix PPC SHA1 routine for large input buffers
34307 Implement safe_strncpy() as strlcpy() and use it more.
34310 Support for extracting configuration from different files
34311 Support for the standard mime.types map in gitweb
34314 git-tar-tree: Simplify write_trailer()
34315 git-tar-tree: documentation update
34316 git-tar-tree: no more void pointer arithmetic
34317 Make release tarballs friendlier to older tar versions
34319 Sean Estabrooks (1):
34320 Add a "--notags" option for git-p4import.
34322 Sven Verdoolaege (1):
34323 git-cvsexportcommit.perl: fix typo
34326 gitweb: Use $hash_base as $search_hash if possible
34328 Uwe Kleine-König (1):
34329 Fix possible out-of-bounds array access
34332 auto-detect changed prefix and/or changed build flags
34333 Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
34336 Version v1.4.0; changes since v1.4.0-rc2:
34337 -----------------------------------------
34339 Horst H. von Brand (1):
34340 Fix formatting of Documentation/git-clone.txt
34342 Junio C Hamano (7):
34343 allow working in repositories with textual symref HEAD
34344 git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin
34345 git-rm: honor -n flag.
34346 builtin-init-db: spell the in-program configuration variable in lowercase.
34347 shared repository - add a few missing calls to adjust_shared_perm().
34348 git-clone: fix --bare over dumb-http
34352 first working version
34429 Make the tag view look like commit header.
34430 allow sorting of index page by project path, owner and age
34431 make index page sorting more visible and increase RSS item count
34432 fix search parsing, later git does not print a trailing space
34433 don't chop_str if adding ... is longer than the original
34434 Show tooltips (like this one :)) containing full titles for truncated commit titles in the summary and shortlog views.
34437 common input validation to allow passing of textual hash id's
34439 translate reference into hash while reading a commit
34440 fix typo in link parameter of git_commit
34442 switch to git-rev-list for commit reading
34444 start searching at the current $hash value
34446 rename "branches" to "heads"
34448 provide filename for "save as" in plaintext views
34449 add Expires: +1d header to commit and commitdiff pages
34452 update the test files to have a diff
34453 escape '+' and ' ' in url's
34454 make ' ' and '+' in filenames some kind of working
34456 escape ' ' with '+' in url's
34457 replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
34459 add missing esc() rename
34465 add broken latin encoding to test file
34466 set logo output to raw mode
34468 allow utf8 characters in url parameter escape
34471 fix quoted filename lookup
34473 fix "rename" output
34479 attach tag to the link
34482 fix leading whitespace in commit text
34484 define default colors
34486 resolve textual hashes when looking up "refs"
34488 fix: Use of uninitialized value
34490 handle utf8 characters from /etc/passwd
34492 remove Christian's email address
34497 check for error return from fork()
34500 Built-in git-get-tar-commit-id
34503 prepend '--' to filelist when calling git-diff-tree
34505 Uwe Kleine-König (1):
34506 Document git-clone --use-separate-remote
34509 Add <author> and <guid> to RSS feed
34512 Version v1.4.0-rc2; changes since v1.4.0-rc1:
34513 ---------------------------------------------
34516 Some doc typo fixes
34517 config.txt grammar, typo, and asciidoc fixes
34518 git-cvsserver asciidoc formatting tweaks
34520 Horst H. von Brand (1):
34521 Cleanup git-send-email.perl:extract_valid_email
34523 Johannes Schindelin (1):
34524 If you have a config containing something like this:
34527 Refactor git_tcp_connect() functions a little.
34530 Misc doc improvements
34531 Document git-ls-tree --fullname
34533 Junio C Hamano (12):
34534 git alias: try alias last.
34535 send-email: be more lenient and just catch obvious mistakes.
34536 send-email: a bit more careful domain regexp.
34537 git-format-patch: add --output-directory long option again
34539 Make index file locking code reusable to others.
34540 refs.c: convert it to use lockfile interface.
34541 ref-log: style fixes.
34542 Documentation: add missing docs make check-docs found.
34543 make clean: remove dist-doc targets.
34544 Documentation: git-ls-tree (typofix)
34545 Documentation: add another example to git-ls-files
34547 Nick Hengeveld (2):
34549 http-fetch: fix possible segfault
34551 Paul Mackerras (12):
34552 gitk: Make a row of controls for controlling highlighting
34553 gitk: Highlight entries in the file list as well
34554 gitk: Highlight paths of interest in tree view as well
34555 gitk: First cut at a search function in the patch/file display window
34556 gitk: Improve the text window search function
34557 gitk: Move "pickaxe" find function to highlight facility
34558 gitk: Fix bug in highlight stuff when no line is selected
34559 gitk: Provide ability to highlight based on relationship to selected commit
34560 gitk: Add a goto next/previous highlighted commit function
34561 gitk: Show nearby tags
34562 gitk: Show branch name(s) as well, if "show nearby tags" is enabled
34563 gitk: Re-read the descendent/ancestor tag & head info on update
34566 Document git aliases support
34567 Documentation: git aliases
34570 Off-by-one error in get_path_prefix(), found by Valgrind
34572 Robert Fitzsimons (1):
34573 builtin-grep: pass ignore case option to external grep
34576 Version v1.4.0-rc1; changes since v1.3.3:
34577 -----------------------------------------
34580 make update-index --chmod work with multiple files and --stdin
34581 remove superflous "const"
34583 Aneesh Kumar K.V (3):
34584 gitview: Add key binding for F5.
34585 gitview: Move the console error messages to message dialog
34586 gitview: Add some useful keybindings.
34588 Björn Engelmann (2):
34589 remove the artificial restriction tagsize < 8kb
34590 add more informative error messages to git-mktag
34592 Catalin Marinas (1):
34593 Add a test-case for git-apply trying to add an ending line
34595 Christian Couder (1):
34596 Builtin git-rev-parse.
34598 Dennis Stosberg (3):
34599 git-write-tree writes garbage on sparc64
34600 git-clean fails on files beginning with a dash
34601 Update documentation for git-format-patch
34603 Dmitry V. Levin (2):
34604 execv_git_cmd: Fix stack buffer overflow.
34605 git_exec_path, execv_git_cmd: ignore empty environment variables
34608 git-cvsimport: Handle "Removed" from pserver
34610 Eric W. Biederman (8):
34611 Implement git-quiltimport
34612 Implement a --dry-run option to git-quiltimport
34613 Make read_one_header_line return a flag not a length.
34614 Move B and Q decoding into check header.
34615 Refactor commit messge handling.
34616 In handle_body only read a line if we don't already have one.
34617 More accurately detect header lines in read_one_header_line
34618 Allow in body headers beyond the in body header prefix.
34621 git-svn: documentation updates
34623 send-email: address expansion for common mailers
34624 Install git-send-email by default
34625 send-email: allow sendmail binary to be used instead of SMTP
34626 send-email: quiet some warnings, reject invalid addresses
34627 commit: allow --pretty= args to be abbreviated
34628 git-svn: starting a 1.1.0-pre development version
34629 git-svn: ignore expansion of svn:keywords
34630 t3300-funny-names: shell portability fixes
34631 tests: Remove heredoc usage inside quotes
34632 t5500-fetch-pack: remove local (bashism) usage.
34633 t6000lib: workaround a possible dash bug
34634 git-svn: t0001: workaround a heredoc bug in old versions of dash
34635 git-svn: remove assertion that broke with older versions of svn
34637 Florian Forster (1):
34638 git-svnimport: Improved detection of merges.
34640 Fredrik Kuivinen (2):
34641 blame: Fix path pruning
34642 Update the documentation for git-merge-base
34644 Horst H. von Brand (4):
34645 Fix some documentation typoes
34646 Documentation: Spelling fixes
34647 Add example xinetd(8) configuration to Documentation/everyday.txt
34648 Fix Documentation/everyday.txt: Junio's workflow
34650 J. Bruce Fields (7):
34651 tutorial: replace "whatchanged" by "log"
34652 tutorial: expanded discussion of commit history
34653 tutorial: add discussion of index file, object database
34654 documentation: mention gitk font adjustment in tutorial
34655 documentation: add brief mention of cat-file to tutorial part I
34656 Documentation: retitle the git-core tutorial
34657 Documentation: fix a tutorial-2 typo
34660 cvsimport: use git-update-index --index-info
34661 cvsimport: cleanup commit function
34662 cvsimport: set up commit environment in perl instead of using env
34663 cat-file: document -p option
34664 cvsimport: avoid "use" with :tag
34665 handle concurrent pruning of packed objects
34666 sha1_file: avoid re-preparing duplicate packs
34669 Don't write directly to a make target ($@).
34671 Johannes Schindelin (25):
34672 builtin-push: resurrect parsing of Push: lines
34673 cache-tree: replace a sscanf() by two strtol() calls
34674 builtin-push: also ask config for remote information
34675 fetch, pull: ask config for remote information
34676 repo-config: fix segfault with no argument.
34677 repo-config: trim white-space before comment
34678 repo-config: support --get-regexp
34679 repo-config: deconvolute logics
34680 fetch, pull: ask config for remote information
34681 Add a conversion tool to migrate remote information into the config
34682 builtin-push: --all and --tags _are_ explicit refspecs
34683 Teach fmt-patch to write individual files.
34684 fmt-patch: output file names to stdout
34685 fmt-patch: implement -o <dir>
34686 Teach fmt-patch about --numbered
34687 Teach fmt-patch about --keep-subject
34688 fmt-patch: understand old <his> notation
34689 Fix users of prefix_path() to free() only when necessary
34690 Fix users of prefix_path() to free() only when necessary
34691 Fix crash when reading the empty tree
34692 diff family: add --check option
34693 fmt-patch: Support --attach
34694 git-format-patch --start-number <n>
34695 send-email: only 'require' instead of 'use' Net::SMTP
34696 format-patch: resurrect extra headers from config
34698 Josef Weidendorfer (1):
34699 gitk: Add a visual tag for remote refs
34701 Junio C Hamano (156):
34702 Fix up default abbrev in setup_revisions() argument parser.
34703 Fix up rev-list option parsing.
34704 Split init_revisions() out of setup_revisions()
34705 rev-list option parser fix.
34706 Built-in git-whatchanged.
34707 Do not fork PAGER=cat
34708 Simplify common default options setup for built-in log family.
34709 log/whatchanged/show - log formatting cleanup.
34710 rev-list --header: output format fix
34711 git.c: LOGSIZE is unused after log printing cleanup.
34712 combine-diff: show diffstat with the first parent.
34713 Fix "git log --stat": make sure to set recursive with --stat.
34714 Tentative built-in format-patch.
34715 sha1_name.c: prepare to make get_tree_entry() reusable from others.
34716 sha1_name.c: no need to include diff.h; tree-walk.h will do.
34717 get_tree_entry(): make it available from tree-walk
34718 Minor tweak on subject line in --pretty=email
34719 diff: move diff.c to diff-lib.c to make room.
34720 Add git-unresolve <paths>...
34721 diff --stat: do not drop rename information.
34722 git-update-index --unresolve
34723 rename internal format-patch wip
34724 Makefile: dependency for builtin-help.o
34725 Add colordiff for git to contrib/colordiff.
34726 Fix "git show --stat"
34729 git-fmt-patch: thinkofix to show [PATCH] properly.
34730 Libified diff-index: backward compatibility fix.
34731 read-cache/write-cache: optionally return cache checksum SHA1.
34733 Update write-tree to use cache-tree.
34734 Invalidate cache-tree entries for touched paths in git-apply.
34735 Use cache-tree in update-index.
34736 Add test-dump-cache-tree
34737 cache-tree: protect against "git prune".
34738 index: make the index file format extensible.
34739 Teach fsck-objects about cache-tree.
34740 cache-tree: sort the subtree entries.
34741 test-dump-cache-tree: report number of subtrees.
34742 Makefile: remove and create libgit.a from scratch.
34743 diff --stat: show complete rewrites consistently.
34744 git-cvsserver: typofixes
34745 t0000-basic: Add ls-tree recursive test back.
34746 Makefile: remove and create xdiff library from scratch.
34747 commit-tree: allow generic object name for the tree as well.
34748 revision parsing: make "rev -- paths" checks stronger.
34749 t0000-basic: more commit-tree tests.
34750 update-index: when --unresolve, smudge the relevant cache-tree entries.
34751 read-tree: teach 1 and 2 way merges about cache-tree.
34752 read-tree: teach 1-way merege and plain read to prime cache-tree.
34753 diff-index: fix compilation warnings.
34754 cache_tree_update: give an option to update cache-tree only.
34755 test-dump-cache-tree: validate the cached data as well.
34756 pack-objects: update size heuristucs.
34757 built-in count-objects.
34758 cache-tree.c: typefix
34760 built-in diff: assorted updates.
34761 builtin-diff.c: die() formatting type fix.
34762 Fix builtin-push to honor Push: lines in remotes file.
34763 Extended SHA1 -- "rev^@" syntax to mean "all parents"
34764 get_sha1(): :path and :[0-3]:path to extract from index.
34765 built-in "git grep"
34766 Use RFC2822 dates from "git fmt-patch".
34767 builtin-grep: wildcard pathspec fixes
34768 builtin-grep: support '-l' option.
34769 builtin-grep: do not use setup_revisions()
34770 fsck-objects: mark objects reachable from cache-tree
34771 builtin-count-objects: make it official.
34772 builtin-diff: call it "git-diff", really.
34773 builtin-log/whatchanged/show: make them official.
34774 show-branch: omit uninteresting merges.
34775 builtin-push: make it official.
34776 builtin-grep: printf %.*s length is int, not ptrdiff_t.
34777 Revert "fetch, pull: ask config for remote information"
34778 builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
34779 builtin-grep: allow more than one patterns.
34780 builtin-grep: support -c (--count).
34781 builtin-grep: support -w (--word-regexp).
34782 builtin-grep: tighten path wildcard vs tree traversal.
34783 core.prefersymlinkrefs: use symlinks for .git/HEAD
34784 repo-config: readability fixups.
34785 builtin-count-objects: open packs when running -v
34786 Fix test-dump-cache-tree in one-tree disappeared case.
34787 read-tree: invalidate cache-tree entry when a new index entry is added.
34788 cache-tree: a bit more debugging support.
34789 builtin-grep: terminate correctly at EOF
34790 builtin-grep: binary files -a and -I
34791 fsck-objects: do not segfault on missing tree in cache-tree
34792 builtin-grep: -L (--files-without-match).
34793 Makefile: do not link rev-list any specially.
34794 delta: stricter constness
34795 pack-object: squelch eye-candy on non-tty
34797 binary diff: further updates.
34798 update-index --unresolve: work from a subdirectory.
34799 checkout-index: plug memory leak from prefix_path()
34800 update-index: plug memory leak from prefix_path()
34801 update-index --again
34802 update-index --again: take optional pathspecs
34803 binary diff and apply: testsuite.
34804 Teach -f <file> option to builtin-grep.
34805 builtin-grep: documentation
34806 get_sha1() - fix infinite loop on nonexistent stage.
34807 Teach git-clean optional <paths>... parameters.
34808 builtin-grep: tighten argument parsing.
34809 builtin-grep: typofix
34810 builtin-grep: -w fix
34811 builtin-grep: -F (--fixed-strings)
34812 checkout: use --aggressive when running a 3-way merge (-m).
34813 diffstat rename squashing fix.
34814 read-tree -u one-way merge fix to check out locally modified paths.
34815 apply --numstat: show new name, not old name.
34816 builtin-grep: unparse more command line options.
34817 apply --cached: apply a patch without using working tree.
34818 git-am: use apply --cached
34819 builtin-diff: fix comparison between two blobs.
34820 merge-base: Clarify the comments on post processing.
34821 read-tree -m -u: do not overwrite or remove untracked working tree files.
34822 builtin-grep: workaround for non GNU grep.
34823 Revert "builtin-grep: workaround for non GNU grep."
34824 apply --cached: do not check newly added file in the working tree
34825 builtin-add: fix unmatched pathspec warnings.
34826 builtin-diff: do not say files are renamed when blob and file are given
34827 Fix build procedure for builtin-init-db
34828 built-in tar-tree and remote tar-tree
34829 git-format-patch: now built-in.
34830 checkdiff_consume: strtol parameter fix.
34831 git-rebase: use canonical A..B syntax to format-patch
34832 tutorial-2: typofix in examples.
34833 mailinfo: skip bogus UNIX From line inside body
34834 CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
34835 builtin format-patch: squelch content-type for 7-bit ASCII
34836 diff: minor option combination fix.
34837 fetch-pack: output refs in the order they were given on the command line.
34838 Tutorial #2: broken link fix.
34839 builtin-rm: squelch compiler warnings.
34840 cvsimport: do not barf on creation of an empty file.
34841 apply: force matching at the beginning.
34842 fetch.c: remove an unused variable and dead code.
34843 ls-remote: fix rsync:// to report HEAD
34844 mailinfo: More carefully parse header lines in read_one_header_line()
34845 gitk: start-up bugfix
34846 built-in format-patch: various fixups.
34847 format-patch: -n and -k are mutually exclusive.
34848 Let git-clone to pass --template=dir option to git-init-db.
34849 git-fetch: avoid using "case ... in (arm)"
34850 adjust to the rebased series by Linus.
34851 send-email: do not pass bogus address to local sendmail binary
34852 format-patch --signoff
34853 fetch.c: do not pass uninitialized lock to unlock_ref().
34854 fetch.c: do not call process_tree() from process_tree().
34855 fetch: do not report "same" unless -verbose.
34856 read-tree --reset: update working tree file for conflicted paths.
34857 rev-parse: tighten constness properly.
34859 Linus Torvalds (60):
34860 Common option parsing for "git log --diff" and friends
34861 Tentative built-in "git show"
34862 Fixes for option parsing
34863 Log message printout cleanups
34864 Log message printout cleanups (#2)
34865 Log message printout cleanups (#3): fix --pretty=oneline
34866 Fix uninteresting tags in new revision parsing
34867 get_sha1() shorthands for blob/tree objects
34868 Allow "git repack" users to specify repacking window/depth
34869 git log: don't do merge diffs by default
34870 Split up builtin commands into separate files from git.c
34871 Fix "git help -a" terminal autosizing
34873 Fix "git-log --parents" breakage post v1.3.0
34874 sha1_to_hex() usage cleanup
34875 git diff: support "-U" and "--unified" options properly
34876 Allow one-way tree merge to remove old files
34877 Simplify "git reset --hard"
34878 builtin-grep: use external grep when we can take advantage of it
34879 read-tree --reset -u fix.
34880 Fix silly typo in new builtin grep
34881 Remove old "git-grep.sh" remnants
34882 libify git-ls-files directory traversal
34883 Clean up git-ls-file directory walking library interface
34884 Do "git add" as a builtin
34885 builtin-add: warn on unmatched pathspecs
34886 builtin-grep: workaround for non GNU grep.
34887 Remove old "git-add.sh" remnants
34888 Prevent bogus paths from being added to the index.
34889 Make "git rev-list" be a builtin
34890 Libify the index refresh logic
34891 Move pathspec matching from builtin-add.c into dir.c
34892 Add builtin "git rm" command
34893 cvsimport: repack every kilo-commits.
34894 apply: treat EOF as proper context.
34895 Clean up sha1 file writing
34896 bogus "fatal: Not a git repository"
34897 t1002: use -U0 instead of --unified=0
34898 Fix "--abbrev=xyz" for revision listing
34899 Fix memory leak in "git rev-list --objects"
34900 Don't use "sscanf()" for tree mode scanning
34901 Add raw tree buffer info to "struct tree"
34902 Make "tree_entry" have a SHA1 instead of a union of object pointers
34903 Switch "read_tree_recursive()" over to tree-walk functionality
34904 Remove "tree->entries" tree-entry list from tree parser
34905 Make "struct tree" contain the pointer to the tree buffer
34906 Make "tree_entry" have a SHA1 instead of a union of object pointers
34907 Switch "read_tree_recursive()" over to tree-walk functionality
34908 builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec()
34909 Remove "tree->entries" tree-entry list from tree parser
34910 fsck-objects: avoid unnecessary tree_entry_list usage
34911 Remove unused "zeropad" entry from tree_list_entry
34912 Convert "mark_tree_uninteresting()" to raw tree walker
34913 Convert fetch.c: process_tree() to raw tree walker
34914 Remove last vestiges of generic tree_entry_list
34915 tree_entry(): new tree-walking helper function
34916 read-tree: fix eye-candy.
34917 Fix typo in tutorial-2.txt
34918 rev-list: fix process_tree() conversion.
34919 pack-objects: improve path grouping heuristics.
34921 Lukas Sandström (2):
34922 Make git-check-format-ref a builtin.
34923 SubmittingPatches: The download location of External Editor has moved
34925 Martin Langhoff (7):
34926 git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
34927 cvsserver: use git-rev-list instead of git-log
34928 cvsserver: use git-rev-list instead of git-log
34929 cvsimport: minor fixups
34930 cvsimport: replace anonymous sub ref with a normal sub
34931 cvsimport: introduce -L<imit> option to workaround memory leaks
34932 cvsimport: introduce _fetchfile() method and used a 1M buffer to read()
34935 Transitively read alternatives
34936 test case for transitive info/alternates
34937 clone: don't clone the info/alternates file
34938 git help: remove whatchanged from list of common commands
34939 Documentation/Makefile: remove extra /
34940 Add instructions to commit template.
34943 Added logged warnings for CVS error returns
34944 Many fixes for most operations in Eclipse.
34945 Change to allow subdir updates from Eclipse
34947 Matthias Kestenholz (1):
34948 add documentation for update-index --unresolve
34950 Matthias Lederhofer (1):
34951 git status: skip empty directories, and add -u to show all untracked files
34953 Nick Hengeveld (3):
34954 git-fetch: resolve remote symrefs for HTTP transport
34955 http: prevent segfault during curl handle reuse
34956 builtin-push: don't pass --thin to HTTP transport
34958 Nicolas Pitre (10):
34959 split the diff-delta interface
34960 use delta index data when finding best delta matches
34961 replace adler32 with Rabin's polynomial in diff-delta
34962 tiny optimization to diff-delta
34963 improve diff-delta with sparse and/or repetitive data
34964 improve base85 generated assembly code
34965 fix diff-delta bad memory access
34966 simple euristic for further free packing improvements
34967 pack-object: slightly more efficient
34968 improve depth heuristic for maximum delta size
34970 Paul Mackerras (19):
34971 gitk: Implement multiple views
34972 gitk: Make File->Update work properly again
34973 gitk: Fix various bugs in the view support
34974 gitk: Don't reread git-rev-list output from scratch on view switch
34975 gitk: Remember the view in the history list
34976 gitk: Let git-rev-list do the argument list parsing
34977 gitk: Use git-rev-parse only to identify file/dir names on cmd line
34978 gitk: Implement "permanent" views (stored in ~/.gitk)
34979 gitk: add menu item for editing the current view
34980 gitk: Use a text widget for the file list
34981 gitk: Add a tree-browsing mode
34982 gitk: Basic support for highlighting one view within another
34983 gitk: Fix file list display when files are renamed
34984 gitk: Allow view to specify arbitrary arguments to git-rev-list
34985 gitk: Fix display of "(...)" for parents/children we haven't drawn
34986 Provide a way to flush git-diff-tree's output
34987 gitk: Fix bug where page-up/down wouldn't always work properly
34988 gitk: show_error fix
34989 Make git-diff-tree indicate when it flushes
34992 Add git-quiltimport to .gitignore.
34993 Builtin git-ls-files.
34994 Builtin git-ls-tree.
34995 Builtin git-tar-tree.
34996 Builtin git-read-tree.
34997 Builtin git-commit-tree.
34999 Builtin git-show-branch.
35000 Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
35002 Peter Hagervall (1):
35003 Sparse fix for builtin-diff
35006 git-repo-config --list support
35007 Deprecate usage of git-var -l for getting config vars list
35008 Call builtin ls-tree in git-cat-file -p
35011 git-send-email: Add References: headers to emails, in addition to In-Reply-To:
35012 Add support for --bcc to git-send-email.
35013 Fix a bug in email extraction used in git-send-email.
35014 Add a basic test case for git send-email, and fix some real bugs discovered.
35016 Salikh Zakirov (1):
35017 Fixed Cygwin CR-munging problem in mailsplit
35020 Document that "git add" only adds non-ignored files.
35022 Sean Estabrooks (19):
35023 Add --continue and --abort options to git-rebase.
35024 Several trivial documentation touch ups.
35025 Fix up docs where "--" isn't displayed correctly.
35026 Update git-unpack-objects documentation.
35027 Clarify git-cherry documentation.
35028 Another config file parsing fix.
35029 t1300-repo-config: two new config parsing tests.
35030 Add "--branches", "--tags" and "--remotes" options to git-rev-parse.
35031 Make git rebase interactive help match documentation.
35032 Add "--summary" option to git diff.
35033 Convert some "apply --summary" users to "diff --summary".
35034 Strip useless "tags/" prefix from git-tag -l output
35035 Allow pickaxe and diff-filter options to be used by git log.
35036 Avoid segfault in diff --stat rename output.
35037 Change GIT-VERSION-GEN to call git commands with "git" not "git-".
35038 Install git builtins into gitexecdir rather than bindir.
35039 Remove possible segfault in http-fetch.
35040 --summary output should print immediately after stats.
35041 A Perforce importer for git.
35043 Serge E. Hallyn (1):
35044 socksetup: don't return on set_reuse_addr() error
35047 gitk: Display commit messages with word wrap
35049 Shawn O. Pearce (24):
35050 Remove unnecessary local in get_ref_sha1.
35051 Improve abstraction of ref lock/write.
35052 Convert update-ref to use ref_lock API.
35053 Log ref updates to logs/refs/<ref>
35054 Support 'master@2 hours ago' syntax
35055 Fix ref log parsing so it works properly.
35056 General ref log reading improvements.
35057 Added logs/ directory to repository layout.
35058 Force writing ref if it doesn't exist.
35059 Log ref updates made by fetch.
35060 Change 'master@noon' syntax to 'master@{noon}'.
35061 Correct force_write bug in refs.c
35062 Change order of -m option to update-ref.
35063 Include ref log detail in commit, reset, etc.
35064 Create/delete branch ref logs.
35065 Enable ref log creation in git checkout -b.
35066 Reference git-check-ref-format in git-branch.
35067 Elaborate on why ':' is a bad idea in a ref name.
35068 Built git-upload-tar should be ignored.
35069 Verify git-commit provides a reflog message.
35070 Test that git-branch -l works.
35071 Remove unnecessary output from t3600-rm.
35072 Improved pack format documentation.
35073 Allow multiple -m options to git-commit.
35075 Tilman Sauerbeck (1):
35076 Documentation/Makefile: create tarballs for the man pages and html files
35079 Builtin git-init-db
35080 Builtin git-cat-file
35081 gitk: Replace "git-" commands with "git "
35084 NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
35085 Problem: 'trap...exit' causes error message when /bin/sh is ash.
35088 Do not call 'cmp' with non-existant -q flag.
35089 Document current cvsexportcommit limitations.
35090 Make cvsexportcommit create parent directories as needed.
35093 Version v1.3.3; changes since v1.3.2:
35094 -------------------------------------
35097 include header to define uint32_t, necessary on Mac OS X
35099 Dennis Stosberg (2):
35100 Fix git-pack-objects for 64-bit platforms
35101 Fix compilation on newer NetBSD systems
35103 Dmitry V. Levin (1):
35104 Separate object name errors from usage errors
35107 apply: fix infinite loop with multiple patches with --index
35108 Install git-send-email by default
35110 Johannes Schindelin (1):
35111 repo-config: trim white-space before comment
35113 Junio C Hamano (6):
35114 core.prefersymlinkrefs: use symlinks for .git/HEAD
35115 repo-config: document what value_regexp does a bit more clearly.
35116 Fix repo-config set-multivar error return path.
35117 Documentation: {caret} fixes (git-rev-list.txt)
35118 checkout: use --aggressive when running a 3-way merge (-m).
35119 Fix pack-index issue on 64-bit platforms a bit more portably.
35121 Linus Torvalds (3):
35122 Fix "git diff --stat" with long filenames
35123 revert/cherry-pick: use aggressive merge.
35124 git config syntax updates
35127 clone: keep --reference even with -l -s
35128 repack: honor -d even when no new pack was created
35130 Matthias Lederhofer (1):
35131 core-tutorial.txt: escape asterisk
35134 Release config lock if the regex is invalid
35136 Sean Estabrooks (3):
35137 Fix for config file section parsing.
35138 Another config file parsing fix.
35139 Ensure author & committer before asking for commit message.
35142 read-cache.c: use xcalloc() not calloc()
35145 Version v1.3.2; changes since v1.3.1:
35146 -------------------------------------
35149 git-format-patch: Use rfc2822 compliant date.
35152 Alphabetize the glossary.
35153 Added definitions for a few words:
35154 Add a few more words to the glossary.
35156 Junio C Hamano (4):
35158 commit-tree.c: check_valid() microoptimization.
35159 verify-pack: check integrity in a saner order.
35160 git-am --resolved: more usable error message.
35162 Linus Torvalds (1):
35163 Fix filename verification when in a subdirectory
35165 Martin Langhoff (1):
35166 git-send-email: fix version string to be valid perl
35168 Matthias Kestenholz (3):
35169 annotate: fix warning about uninitialized scalar
35170 annotate: display usage information if no filename was given
35171 fix various typos in documentation
35173 Robert Shearman (1):
35174 Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
35176 Sean Estabrooks (4):
35177 Update the git-branch man page to include the "-r" option,
35178 Fix up remaining man pages that use asciidoc "callouts".
35179 Properly render asciidoc "callouts" in git man pages.
35180 Fix trivial typo in git-log man page.
35183 Version v1.3.1; changes since v1.3.0:
35184 -------------------------------------
35187 Fix filename scaling for binary files
35189 Junio C Hamano (5):
35190 git-merge: a bit more readable user guidance.
35191 pre-commit hook: complain about conflict markers.
35192 git-commit --amend: two fixes.
35193 pack-objects: do not stop at object that is "too small"
35194 mailinfo: decode underscore used in "Q" encoding properly.
35196 Linus Torvalds (1):
35197 git-log produces no output
35200 fix pack-object buffer size
35202 Paul Mackerras (1):
35203 rev-parse: better error message for ambiguous arguments
35206 Document git-var -l listing also configuration variables
35207 Document the configuration file
35210 Reintroduce svn pools to solve the memory leak.
35212 Serge E. Hallyn (1):
35213 socksetup: don't return on set_reuse_addr() error
35215 Shawn O. Pearce (1):
35216 Document git-clone --reference
35219 Version v1.3.0; changes since v1.3.0-rc4:
35220 -----------------------------------------
35222 A Large Angry SCM (1):
35225 Herbert Valerio Riedel (1):
35226 git-svnimport symlink support
35228 Johannes Schindelin (2):
35229 diff-options: add --patch-with-stat
35230 pager: do not fork a pager if PAGER is set to empty.
35233 Add git-annotate(1) and git-blame(1)
35235 Junio C Hamano (9):
35236 rev-list --bisect: limit list before bisecting.
35237 diff-tree: typefix.
35238 diff --stat: do not do its own three-dashes.
35239 diff-files --stat: do not dump core with unmerged index.
35240 reading $GIT_DIR/info/graft - skip comments correctly.
35241 rev-list --boundary: show boundary commits even when limited otherwise.
35242 packed_object_info_detail(): check for corrupt packfile.
35243 diff --stat: make sure to set recursive.
35246 Linus Torvalds (1):
35247 Support "git cmd --help" syntax
35249 Paul Mackerras (1):
35250 gitk: Fix bug caused by missing commitlisted elements
35252 Serge E. Hallyn (5):
35253 cleanups: Fix potential bugs in connect.c
35254 cleanups: Remove unused vars from combine-diff.c
35255 cleanups: Remove impossible case in quote.c
35256 cleanups: prevent leak of two strduped strings in config.c
35257 cleanups: remove unused variable from exec_cmd.c
35260 Allow empty lines in info/grafts
35263 Version v1.3.0-rc4; changes since v1.3.0-rc3:
35264 ---------------------------------------------
35266 Davide Libenzi (1):
35267 xdiff: post-process hunks to make them consistent.
35269 Dennis Stosberg (2):
35270 Solaris 9 also wants our own unsetenv/setenv.
35271 Replace index() with strchr().
35273 Eric W. Biederman (1):
35274 Implement limited context matching in git-apply.
35276 Johannes Schindelin (2):
35277 diff-options: add --stat (take 2)
35278 diff-options: add --stat (take 2)
35280 Junio C Hamano (31):
35281 git-log: match rev-list --abbrev and --abbrev-commit
35282 diff: fix output of total-rewrite diff.
35283 diffcore-rename: fix merging back a broken pair.
35284 log-tree: separate major part of diff-tree.
35285 git log [diff-tree options]...
35286 Retire diffcore-pathspec.
35287 tree-diff: do not assume we use only one pathspec
35288 git log --full-diff
35290 blame and friends: adjust to multiple pathspec change.
35291 Retire git-log.sh (take#2)
35292 diff-* --patch-with-raw
35293 Retire git-log.sh (take #3)
35294 combine-diff: do not lose hunks with only deletion at end.
35295 combine-diff: fix hunks at the end (take #2).
35296 Retire t5501-old-fetch-and-upload test.
35297 git-commit: do not muck with commit message when no_edit is set.
35298 stripspace: make sure not to leave an incomplete line.
35299 combine-diff: type fix.
35300 Documentation: add a couple of missing docs.
35301 Makefile: $(MAKE) check-docs
35302 git-log: do not output excess blank line between commits
35303 t3600-rm: skip failed-remove test when we cannot make an unremovable file.
35304 Fix-up previous expr changes.
35305 diff --stat: no need to ask funcnames nor context.
35307 stripspace: incomplete line fix (take #2)
35308 Retire git-log.sh (take #4)
35309 git-log <diff-options> <paths> documentation
35310 "git cmd -h" for shell scripts.
35313 Linus Torvalds (4):
35314 Make "--parents" logs also be incremental
35315 When showing a commit message, do not lose an incomplete line.
35316 Use less memory in "git log"
35317 Clean up trailing whitespace when pretty-printing commits
35320 xdiff/xdiffi.c: fix warnings about possibly uninitialized variables
35323 Shell utilities: Guard against expr' magic tokens.
35326 Improve the git-diff-tree -c/-cc documentation
35327 Document --patch-with-raw
35328 Separate the raw diff and patch with a newline
35331 Version v1.3.0-rc3; changes since v1.3.0-rc2:
35332 ---------------------------------------------
35335 Tweaks to make asciidoc play nice.
35337 Johannes Schindelin (3):
35338 cvsimport: use git-update-ref when updating
35339 On some platforms, certain headers need to be included before regex.h
35340 Fix compile with expat, but an old curl version
35343 Added Packing Heursitics IRC writeup.
35345 Junio C Hamano (16):
35346 git-clone: fix handling of upsteram whose HEAD does not point at master.
35347 combine-diff: use built-in xdiff.
35348 parse_date(): fix parsing 03/10/2006
35349 combine-diff: refactor built-in xdiff interface.
35350 diff_flush(): leakfix.
35351 combine-diff: move the code to parse hunk-header into common library.
35352 blame: use built-in xdiff
35353 date parsing: be friendlier to our European friends.
35354 blame.c: fix completely broken ancestry traversal.
35355 Match ofs/cnt types in diff interface.
35356 blame -S <ancestry-file>
35357 Add Documentation/technical/pack-format.txt
35358 Thin pack generation: optimization.
35359 rev-list --abbrev-commit
35360 count-delta: match get_delta_hdr_size() changes.
35363 Karl Hasselström (1):
35364 git-svnimport: Don't assume that copied files haven't changed
35367 Provide configurable UI font for gitk
35370 git-commit: document --amend
35373 gitk: Use git wrapper to run git-ls-remote.
35375 Mike McCormack (3):
35376 Avoid a divide by zero if there's no messages to send.
35377 Avoid a crash if realloc returns a different pointer.
35378 Add documentation for git-imap-send.
35380 Nick Hengeveld (1):
35381 http-fetch: add optional DAV-based pack list
35384 check patch_delta bounds more carefully
35386 Paul Mackerras (3):
35387 gitk: replace parent and children arrays with lists
35388 gitk: Add a help menu item to display key bindings
35389 gitk: Fix incorrect invocation of getmergediffline
35392 Add git-clean command
35393 gitk: Fix searching for filenames in gitk
35396 Support for pickaxe matching regular expressions
35398 Rutger Nijlunsing (1):
35399 gitk: add key bindings for selecting first and last commit
35401 Stephen Rothwell (1):
35402 gitk: allow goto heads
35405 Version v1.3.0-rc2; changes since v1.3.0-rc1:
35406 ---------------------------------------------
35408 Davide Libenzi (1):
35409 Clean-up trivially redundant diff.
35412 contrib/git-svn: force GIT_DIR to an absolute path
35413 contrib/git-svn: accept configuration via repo-config
35414 contrib/git-svn: documentation updates
35415 contrib/git-svn: ensure repo-config returns a value before using it
35416 contrib/git-svn: make sure our git-svn is up-to-date for test
35417 contrib/git-svn: handle array values correctly
35419 J. Bruce Fields (1):
35420 Documentation: revise top of git man page
35423 Add ALL_LDFLAGS to the git target.
35424 Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
35427 fix repacking with lots of tags
35429 Junio C Hamano (14):
35430 rev-list --no-merges: argument parsing fix.
35431 rev-list: memory usage reduction.
35432 rev-list --boundary
35433 revision arguments: ..B means HEAD..B, just like A.. means A..HEAD
35434 revision.c "..B" syntax: constness fix
35435 assume unchanged git: diff-index fix.
35436 tree/diff header cleanup.
35437 rev-list --boundary: fix re-injecting boundary commits.
35438 Makefile: many programs now depend on xdiff/lib.a having been built.
35439 revision: --topo-order and --unpacked
35440 revision: simplify argument parsing.
35441 revision: --max-age alone does not need limit_list() anymore.
35442 safe_fgets() - even more anal fgets()
35445 Linus Torvalds (5):
35446 Move "--parent" parsing into generic revision.c library code
35447 Make path-limiting be incremental when possible.
35448 revision: Fix --topo-order and --max-age with reachability limiting.
35449 Fix Solaris stdio signal handling stupidities
35450 pack-objects: be incredibly anal about stdio semantics
35453 xdiff: Show function names in hunk headers.
35455 Nick Hengeveld (2):
35456 git-ls-remote: send no-cache header when fetching info/refs
35457 Set HTTP user agent to git/GIT_VERSION
35459 Paul Mackerras (5):
35460 gitk: Use the new --boundary flag to git-rev-list
35461 gitk: Show diffs for boundary commits
35462 gitk: Prevent parent link from overwriting commit headline
35463 gitk: Allow top panes to scroll horizontally with mouse button 2
35464 gitk: Better workaround for arrows on diagonal line segments
35467 Use blob_, commit_, tag_, and tree_type throughout.
35468 Replace xmalloc+memset(0) with xcalloc.
35471 Remove useless pointer update
35472 Fix sparse warnings about usage of 0 instead of NULL
35473 Fix sparse warnings about non-ANSI function prototypes
35476 Make git-clone to take long double-dashed origin option (--origin)
35477 git-clone: exit early if repo isn't specified
35480 Version v1.3.0-rc1; changes since v1.2.6:
35481 -----------------------------------------
35484 PATCH: simplify calls to git programs in git-fmt-merge-msg
35485 workaround fat/ntfs deficiencies for t3600-rm.sh (git-rm)
35487 Alexandre Julliard (12):
35488 Add an Emacs interface in contrib.
35489 git-format-patch: Always add a blank line between headers and body.
35490 contrib/emacs: Add an Emacs VC backend.
35491 git.el: Portability fixes for XEmacs and Emacs CVS.
35492 git.el: Set default directory before running the status mode setup hooks.
35493 git.el: Automatically update .gitignore status.
35494 git.el: Added support for Signed-off-by.
35495 git.el: Added customize support for all parameters.
35496 ls-files: Don't require exclude files to end with a newline.
35497 git.el: More robust handling of subprocess errors when returning strings.
35498 git.el: Get the default user name and email from the repository config.
35499 git.el: Added a function to diff against the other heads in a merge.
35502 git-svnimport: if a limit is specified, respect it
35504 Aneesh Kumar K.V (16):
35505 Add contrib/gitview from Aneesh.
35506 Add a README for gitview
35508 gitview: Read tag and branch information using git ls-remote
35509 gitview: Use monospace font to draw the branch and tag name
35510 gitview: Display the lines joining commit nodes clearly.
35511 gitview: Fix DeprecationWarning
35512 gitview: Bump the rev
35513 gitview: Code cleanup
35514 gitview: Fix the graph display .
35515 gitview: Fix the encoding related bug
35516 gitview: Remove trailing white space
35517 gitview: Some window layout changes.
35518 gitview: Set the default width of graph cell
35519 gitview: Use horizontal scroll bar in the tree view
35520 gitview: pass the missing argument _show_clicked_cb.
35523 git-rebase: Clarify usage statement and copy it into the actual documentation.
35524 New test to verify that when git-clone fails it cleans up the new directory.
35525 git-ls-files: Fix, document, and add test for --error-unmatch option.
35526 Add new git-rm command with documentation
35527 git-rm: Fix to properly handle files with spaces, tabs, newlines, etc.
35529 Dmitry V. Levin (1):
35530 git/Documentation: fix SYNOPSIS style bugs
35533 Introducing contrib/git-svn.
35534 git-svn: fix revision order when XML::Simple is not loaded
35535 git-svn: ensure fetch always works chronologically.
35536 git-svn: remove files from the index before adding/updating
35537 git-svn: fix a typo in defining the --no-stop-on-copy option
35538 git-svn: allow --find-copies-harder and -l<num> to be passed on commit
35539 git-svn: Allow for more argument types for commit (from..to)
35540 git-svn: remove any need for the XML::Simple dependency
35541 git-svn: change ; to && in addremove()
35542 contrib/git-svn.txt: add a note about renamed/copied directory support
35543 git-svn: fix several corner-case and rare bugs with 'commit'
35544 contrib/git-svn: add Makefile, test, and associated ignores
35545 git-svn: 0.9.1: add --version and copyright/license (GPL v2+) information
35546 contrib/git-svn: add show-ignore command
35547 contrib/git-svn: optimize sequential commits to svn
35548 contrib/git-svn: version 0.10.0
35549 contrib/git-svn: tell the user to not modify git-svn-HEAD directly
35550 contrib/git-svn: correct commit example in manpage
35551 contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD
35552 git-branch: add -r switch to list refs/remotes/*
35553 contrib/git-svn: add -b/--branch switch for branch detection
35554 contrib/git-svn: several small bug fixes and changes
35555 contrib/git-svn: strip 'git-svn-id:' when commiting to SVN
35556 contrib/git-svn: allow --authors-file to be specified
35557 contrib/git-svn: cleanup option parsing
35558 contrib/git-svn: create a more recent master if one does not exist
35559 contrib/git-svn: avoid re-reading the repository uuid, it never changes
35560 contrib/git-svn: add --id/-i=$GIT_SVN_ID command-line switch
35561 contrib/git-svn: better documenting of CLI switches
35562 send-email: accept --no-signed-off-by-cc as the documentation states
35563 contrib/git-svn: fix a copied-tree bug in an overzealous assertion
35564 contrib/git-svn: fix svn compat and fetch args
35565 contrib/git-svn: remove the --no-stop-on-copy flag
35566 contrib/git-svn: fix a harmless warning on rebuild (with old repos)
35567 fetch,parse-remote,fmt-merge-msg: refs/remotes/* support
35568 ls-tree: add --abbrev[=<n>] option
35569 ls-files: add --abbrev[=<n>] option
35570 contrib/git-svn: allow rebuild to work on non-linear remote heads
35571 send-email: use built-in time() instead of /bin/date '+%s'
35572 send-email: Change from Mail::Sendmail to Net::SMTP
35573 send-email: try to order messages in email clients more correctly
35574 send-email: lazy-load Email::Valid and make it optional
35575 contrib/git-svn: stabilize memory usage for big fetches
35577 Fernando J. Pereda (1):
35578 Allow building Git in systems without iconv
35581 AsciiDoc fix for tutorial
35582 Tweak asciidoc output to work with broken docbook-xsl
35583 Fix multi-paragraph list items in OPTIONS section
35584 Format tweaks for asciidoc.
35586 Fredrik Kuivinen (13):
35587 Add git-blame, a tool for assigning blame.
35589 git-blame: Make the output human readable
35590 git-blame: Use the same tests for git-blame as for git-annotate
35591 Fix some inconsistencies in the docs
35592 Remove trailing dot after short description
35593 Nicer output from 'git'
35594 Make it possible to not clobber object.util in sort_in_topological_order (take 2)
35595 rev-lib: Make it easy to do rename tracking (take 2)
35596 blame: Rename detection (take 2)
35597 blame: Nicer output
35598 blame: Fix git-blame <directory>
35599 Makefile: Add TAGS and tags targets
35601 J. Bruce Fields (1):
35602 Document git-rebase behavior on conflicts.
35605 Fix typo in git-rebase.sh.
35607 Jeff Muizelaar (2):
35608 cosmetics: change from 'See-Also' to 'See Also'
35609 documentation: add 'see also' sections to git-rm and git-add
35611 Johannes Schindelin (13):
35613 Optionally support old diffs
35615 Optionally work without python
35616 Fixes for ancient versions of GNU make
35617 avoid makefile override warning
35618 Really honour NO_PYTHON
35620 Use Ryan's git-annotate instead of jsannotate
35621 Warn about invalid refs
35622 Fix test case for some sed
35623 imap-send: Add missing #include for macosx
35624 Remove dependency on a file named "-lz"
35627 Add git-show reference
35628 Call out the two different uses of git-branch and fix a typo.
35629 Document the default source of template files.
35630 Clarify git-rebase example commands.
35631 Reference git-commit-tree for env vars.
35633 Rewrite synopsis to clarify the two primary uses of git-checkout.
35634 Clarify and expand some hook documentation.
35635 Removed bogus "<snap>" identifier.
35638 manpages: insert two missing [verse] markers for multi-line SYNOPSIS
35639 repo-config: give value_ a sane default so regexec won't segfault
35641 Josef Weidendorfer (1):
35642 git-mv: fix moves into a subdir from outside
35644 Junio C Hamano (137):
35645 "Assume unchanged" git
35646 "Assume unchanged" git: do not set CE_VALID with --refresh
35647 ls-files: debugging aid for CE_VALID changes.
35648 "Assume unchanged" git: --really-refresh fix.
35649 ls-files: split "show-valid-bit" into a different option.
35650 "assume unchanged" git: documentation.
35651 cache_name_compare() compares name and stage, nothing else.
35652 git-commit: Now --only semantics is the default.
35653 rebase: allow a hook to refuse rebasing.
35654 commit: detect misspelled pathspec while making a partial commit.
35655 rebase: allow rebasing onto different base.
35656 ls-files --error-unmatch pathspec error reporting fix.
35657 Detect misspelled pathspec to git-add
35658 packed objects: minor cleanup
35659 topo-order: make --date-order optional.
35660 pack-objects: reuse data from existing packs.
35661 pack-objects: finishing touches.
35662 git-repack: allow passing a couple of flags to pack-objects.
35663 git-tag: -l to list tags (usability).
35664 Add contrib/README.
35665 SubmittingPatches: note on whitespaces
35666 pack-objects: avoid delta chains that are too long.
35667 Make "empty ident" error message a bit more helpful.
35668 Delay "empty ident" errors until they really matter.
35669 Keep Porcelainish from failing by broken ident after making changes.
35670 fmt-merge-msg: say which branch things were merged into unless 'master'
35671 Allow git-mv to accept ./ in paths.
35672 Documentation: fix typo in rev-parse --short option description.
35673 fmt-merge-msg: do not add excess newline at the end.
35674 rev-list --objects-edge
35675 Thin pack - create packfile with missing delta base.
35676 send-pack --thin: use "thin pack" delta transfer.
35677 Add git-push --thin.
35678 Use thin pack transfer in "git fetch".
35679 fmt-merge-msg: avoid open "-|" list form for Perl 5.6
35680 rerere: avoid open "-|" list form for Perl 5.6
35681 send-email: avoid open "-|" list form for Perl 5.6
35682 svnimport: avoid open "-|" list form for Perl 5.6
35683 cvsimport: avoid open "-|" list form for Perl 5.6
35684 Fix fmt-merge-msg counting.
35685 cherry-pick/revert: error-help message rewording.
35686 git-mktree: reverse of git-ls-tree.
35687 rev-list.c: fix non-grammatical comments.
35688 send-pack: do not give up when remote has insanely large number of refs.
35689 gitview: ls-remote invocation shellquote safety.
35690 pack-objects: thin pack micro-optimization.
35691 pack-objects: use full pathname to help hashing with "thin" pack.
35692 count-delta: tweak counting of copied source material.
35693 count-delta: fix counting of copied source.
35694 Tweak break/merge score to adjust to the new delta generation code.
35695 pack-objects: allow "thin" packs to exceed depth limits
35696 rev-list --objects-edge: remove duplicated edge commit output.
35697 rev-list --objects: use full pathname to help hashing.
35698 pack-objects: hash basename and direname a bit differently.
35699 Revert "diff-delta: produce optimal pack data"
35700 Build and install git-mailinfo.
35701 rev-list split: minimum fixup.
35702 apply --whitespace fixes and enhancements.
35703 apply: squelch excessive errors and --whitespace=error-all
35704 apply --whitespace: configuration option.
35705 git-apply --whitespace=nowarn
35706 Revert "Revert "diff-delta: produce optimal pack data""
35707 git-apply: war on whitespace -- finishing touches.
35708 diffcore-break: micro-optimize by avoiding delta between identical files.
35709 diffcore-rename: split out the delta counting code.
35710 diffcore-delta: stop using deltifier for packing.
35711 git-am: --whitespace=x option.
35712 diff-delta: cull collided hash bucket more aggressively.
35713 git-log (internal): add approxidate.
35714 git-log (internal): more options.
35715 Pretty-print tagger dates.
35716 war on whitespaces: documentation.
35717 Documentation: read-tree --aggressive
35718 Documentation: rev-list --objects-edge
35719 annotate: resurrect raw timestamps.
35720 setup_revisions(): handle -n<n> and -<n> internally.
35721 GIT-VERSION-GEN: squelch unneeded error from "cat version"
35722 show-branch --topics
35724 git-commit: make sure we protect against races.
35725 diffcore-rename: similarity estimator fix.
35726 show-branch --topics: omit more uninteresting commits.
35727 count-delta: no need for this anymore.
35728 diffcore-break: similarity estimator fix.
35729 diffcore-delta: make change counter to byte oriented again.
35730 git-commit --amend: allow empty commit.
35732 verify-pack -v: show delta-chain histogram.
35733 blame: avoid -lm by not using log().
35734 blame and annotate: show localtime with timezone.
35735 blame: avoid "diff -u0".
35736 annotate/blame tests updates.
35737 annotate-blame test: don't "source", but say "."
35738 annotate-blame test: add evil merge.
35739 blame: unbreak "diff -U 0".
35740 annotate-blame: tests incomplete lines.
35741 pack-objects: simplify "thin" pack.
35742 Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
35743 refs.c::do_for_each_ref(): Finish error message lines with "\n"
35744 fsck-objects: Remove --standalone
35745 Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward message.
35746 try_to_simplify_commit(): do not skip inspecting tree change at boundary.
35747 repack: prune loose objects when -d is given
35748 git-diff: -p disables rename detection.
35749 diffcore-rename: somewhat optimized.
35750 revision traversal: --remove-empty fix.
35751 revision traversal: --remove-empty fix (take #2).
35752 diffcore-delta: make the hash a bit denser.
35753 diffcore-delta: tweak hashbase value.
35754 cvsimport: honor -i and non -i upon subsequent imports
35755 fetch: exit non-zero when fast-forward check fails.
35756 cvsimport: fix reading from rev-parse
35757 git-pull: run repo-config with dash form.
35758 unpack_delta_entry(): reduce memory footprint.
35759 generate-cmdlist: style cleanups.
35761 git-merge knows some strategies want to skip trivial merges
35762 http-fetch: nicer warning for a server with unreliable 404 status
35763 core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.
35764 revamp git-clone (take #2).
35765 get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
35766 clone: record the remote primary branch with remotes/$origin/HEAD
35767 http-push.c: squelch C90 warnings.
35768 git-apply: do not barf when updating an originally empty file.
35769 rev-list --timestamp
35770 git-clone: typofix.
35771 git-pull: further safety while on tracking branch.
35772 git-pull: reword "impossible to fast-forward" message.
35773 sha1_name: warning ambiguous refs.
35774 sha1_name: make core.warnambiguousrefs the default.
35775 send-email: Identify author at the top when sending e-mail
35776 commit-tree: check return value from write_sha1_file()
35777 built-in diff: minimum tweaks
35778 true built-in diff: run everything in-core.
35779 git-push: make --thin pack transfer the default.
35780 add clean and ignore rules for xdiff/
35783 Karl Hasselström (7):
35784 git-svnimport: -r adds svn revision number to commit messages
35785 svnimport: Mention -r in usage summary
35786 svnimport: Convert executable flag
35787 svnimport: Convert the svn:ignore property
35788 svnimport: Read author names and emails from a file
35789 Let git-svnimport's author file use same syntax as git-cvsimport's
35790 Save username -> Full Name <email@addr.es> map file
35792 Linus Torvalds (21):
35793 Handling large files with GIT
35794 Handling large files with GIT
35795 git-merge-tree: generalize the "traverse <n> trees in sync" functionality
35796 Teach the "git" command to handle some commands internally
35797 First cut at libifying revlist generation
35798 Make git diff-generation use a simpler spawn-like interface
35799 The war on trailing whitespace
35800 Splitting rev-list into revisions lib, end of beginning.
35801 git-rev-list libification: rev-list walking
35802 Introduce trivial new pager.c helper infrastructure
35803 Tie it all together: "git log"
35804 Rip out merge-order and make "git log <paths>..." work again.
35805 get_revision(): do not dig deeper when we know we are at the end.
35806 git-fmt-merge-msg cleanup
35807 Fix up diffcore-rename scoring
35808 diffcore-delta: 64-byte-or-EOL ultrafast replacement.
35809 diffcore-delta: 64-byte-or-EOL ultrafast replacement (hash fix).
35810 git-apply: safety fixes
35811 Use a *real* built-in diff generator
35812 builtin-diff: \No newline at end of file.
35813 Fix error handling for nonexistent names
35815 Lukas Sandström (1):
35816 git-fetch: print the new and old ref when fast-forwarding
35818 Marco Costalba (1):
35819 Add a Documentation/git-tools.txt
35822 imap-send: cleanup execl() call to use NULL sentinel instead of 0
35825 Let merge set the default strategy.
35828 combine-diff: Honour --full-index.
35829 combine-diff: Honour -z option correctly.
35830 Documentation/Makefile: Some `git-*.txt' files aren't manpages.
35831 gitignore: Ignore some more boring things.
35832 contrib/emacs/Makefile: Provide tool for byte-compiling files.
35833 annotate-tests: override VISUAL when running tests.
35835 Martin Langhoff (18):
35836 Introducing git-cvsserver -- a CVS emulator for git.
35837 cvsserver: add notes on how to get a checkout under Eclipse
35838 cvsserver: Eclipse compat fixes - implement Questionable, alias rlog, add a space after the U
35839 cvsserver: Eclipse compat - browsing 'modules' (heads in our case) works
35840 cvsserver: add notes on how to get a checkout under Eclipse
35841 cvsserver: Eclipse compat fixes - implement Questionable, alias rlog, add a space after the U
35842 cvsserver: Eclipse compat - browsing 'modules' (heads in our case) works
35843 cvsserver: Checkout correctly on Eclipse
35844 annotate: fix -S parameter to take a string
35845 cvsserver: Eclipse compat -- now "compare with latest from HEAD" works
35846 cvsserver: checkout faster by sending files in a sensible order
35847 cvsserver: fix checkouts with -d <somedir>
35848 cvsserver: checkout faster by sending files in a sensible order
35849 cvsserver: fix checkouts with -d <somedir>
35850 cvsserver: nested directory creation fixups for Eclipse clients
35851 cvsserver: better error messages
35852 cvsserver: anonymous cvs via pserver support
35853 cvsserver: updated documentation
35856 gitk: Make error_popup react to Return
35858 Matthias Urlichs (2):
35859 cvsimport: Remove master-updating code
35860 Don't recurse into parents marked uninteresting.
35862 Mike McCormack (5):
35863 Allow adding arbitary lines in the mail header generated by format-patch.
35864 Allow format-patch to attach patches
35865 Document the --attach flag.
35866 Describe how to add extra mail header lines in mail generated by git-format-patch.
35867 Add git-imap-send, derived from isync 1.0.1.
35869 Nick Hengeveld (10):
35870 Update http-push functionality
35871 http-push: fix revision walk
35872 HTTP slot reuse fixes
35873 http-push: refactor remote file/directory processing
35874 http-push: improve remote lock management
35875 http-push: support for updating remote info/refs
35877 Fix broken slot reuse when fetching alternates
35878 http-push: add support for deleting remote branches
35879 http-push: don't assume char is signed
35881 Nicolas Pitre (11):
35882 relax delta selection filtering in pack-objects
35883 diff-delta: fold two special tests into one plus cleanups
35884 diff-delta: produce optimal pack data
35885 diff-delta: big code simplification
35886 diff-delta: bound hash list length to avoid O(m*n) behavior
35887 diff-delta: produce optimal pack data
35888 diff-delta: bound hash list length to avoid O(m*n) behavior
35889 diff-delta: allow reusing of the reference buffer index
35890 test-delta needs zlib to compile
35891 diff-delta: bound hash list length to avoid O(m*n) behavior
35892 3% tighter packs for free
35895 allow double click on current HEAD id after git-pull
35898 Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables
35900 Paul Mackerras (13):
35901 gitk: Make "find" on "Files" work again.
35902 gitk: New improved gitk
35903 gitk: Fix clicks on arrows on line ends
35904 gitk: Fix Update menu item
35905 gitk: Various speed improvements
35906 gitk: Further speedups
35907 gitk: Fix a bug in drawing the selected line as a thick line
35908 gitk: Fix display of diff lines beginning with --- or +++
35909 gitk: Make commitdata an array rather than a list
35910 gitk: Don't change cursor at end of layout if find in progress
35911 gitk: Make downward-pointing arrows end in vertical line segment
35912 gitk: Improve appearance of first child links
35913 gitk: Fix two bugs reported by users
35916 gitview: Select the text color based on whether the entry in highlighted. Use standard font.
35919 Properly git-bisect reset after bisecting from non-master head
35920 Optionally do not list empty directories in git-ls-files --others
35922 Randal L. Schwartz (1):
35923 fix imap-send for OSX
35926 tar-tree: Use SHA1 of root tree for the basedir
35927 tar-tree: Introduce write_entry()
35928 tar-tree: Use write_entry() to write the archive contents
35929 tar-tree: Remove obsolete code
35930 tar-tree: Use the prefix field of a tar header
35933 send-email: Add some options for controlling how addresses are automatically added to the cc: list.
35934 send-email: Add --cc
35935 Add git-annotate, a tool for assigning blame.
35936 annotate: Handle dirty state and arbitrary revisions.
35937 annotate: Convert all -| calls to use a helper open_pipe().
35938 annotate: Use qx{} for pipes on activestate.
35939 annotate: handle \No newline at end of file.
35940 annotate: Add a basic set of test cases.
35941 annotate: Support annotation of files on other revisions.
35943 Sean Estabrooks (1):
35944 annotate.perl triggers rpm bug
35946 Shawn O. Pearce (7):
35947 git ls files recursively show ignored files
35948 Add missing programs to ignore list
35949 Darwin: Ignore missing /sw/lib
35950 Teach git-checkout-index to read filenames from stdin.
35951 Prevent --index-info from ignoring -z.
35952 Add --temp and --stage=all options to checkout-index.
35953 Add missing semicolon to sed command.
35956 Use setenv(), fix warnings
35959 fix warning from pack-objects.c
35960 Re-fix compilation warnings.
35961 annotate should number lines starting with 1
35962 fix field width/precision warnings in blame.c
35965 Be verbose when !initial commit
35968 Version v1.2.6; changes since v1.2.5:
35969 -------------------------------------
35971 Junio C Hamano (3):
35972 parse_date(): fix parsing 03/10/2006
35973 diff_flush(): leakfix.
35974 count-delta: match get_delta_hdr_size() changes.
35977 check patch_delta bounds more carefully
35980 Version v1.2.5; changes since v1.2.4:
35981 -------------------------------------
35984 Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
35986 Junio C Hamano (3):
35987 read-tree --aggressive: remove deleted entry from the working tree.
35988 tar-tree: file/dirmode fix.
35989 safe_fgets() - even more anal fgets()
35991 Linus Torvalds (2):
35992 Fix Solaris stdio signal handling stupidities
35993 pack-objects: be incredibly anal about stdio semantics
35996 Version v1.2.4; changes since v1.2.3:
35997 -------------------------------------
36000 fix t5600-clone-fail-cleanup.sh on windows
36002 Josef Weidendorfer (2):
36003 git-mv: Allow -h without repo & fix error message
36004 git-mv: fixes for path handling
36006 Junio C Hamano (13):
36007 checkout - eye candy.
36008 Give no terminating LF to error() function.
36009 diffcore-rename: plug memory leak.
36010 git-am: do not allow empty commits by mistake.
36011 sample hooks template.
36012 apply --whitespace fixes and enhancements.
36013 apply: squelch excessive errors and --whitespace=error-all
36014 apply --whitespace: configuration option.
36015 git-apply --whitespace=nowarn
36016 git-apply: war on whitespace -- finishing touches.
36017 git-am: --whitespace=x option.
36018 diffcore-break: micro-optimize by avoiding delta between identical files.
36019 Allow git-mv to accept ./ in paths.
36021 Linus Torvalds (1):
36022 The war on trailing whitespace
36025 combine-diff: Honour --full-index.
36026 combine-diff: Honour -z option correctly.
36029 Version v1.2.3; changes since v1.2.2:
36030 -------------------------------------
36033 git-add: Add support for --, documentation, and test.
36034 git-push: Update documentation to describe the no-refspec behavior.
36036 Junio C Hamano (11):
36037 format-patch: pretty-print timestamp correctly.
36038 detect broken alternates.
36039 pack-objects: reuse data from existing packs.
36040 pack-objects: finishing touches.
36041 git-repack: allow passing a couple of flags to pack-objects.
36042 pack-objects: avoid delta chains that are too long.
36043 Make "empty ident" error message a bit more helpful.
36044 Delay "empty ident" errors until they really matter.
36045 Keep Porcelainish from failing by broken ident after making changes.
36046 pack-objects eye-candy: finishing touches.
36047 git-fetch: follow tag only when tracking remote branch.
36050 nicer eye candies for pack-objects
36051 also adds progress when actually writing a pack
36054 Version v1.2.2; changes since v1.2.1:
36055 -------------------------------------
36058 Trap exit to clean up created directory if clone fails.
36059 Abstract test_create_repo out for use in tests.
36060 Prevent git-upload-pack segfault if object cannot be found
36063 archimport: remove files from the index before adding/updating
36066 git-rev-parse: Fix --short= option parsing
36067 Document --short and --git-dir in git-rev-parse(1)
36070 Fix retries in git-cvsimport
36072 Shawn O. Pearce (1):
36073 Make git-reset delete empty directories
36076 Version v1.2.1; changes since v1.2.0:
36077 -------------------------------------
36079 Fernando J. Pereda (1):
36080 Print an error if cloning a http repo and NO_CURL is set
36082 Fredrik Kuivinen (1):
36083 s/SHELL/SHELL_PATH/ in Makefile
36085 Josef Weidendorfer (1):
36086 More useful/hinting error messages in git-checkout
36088 Junio C Hamano (6):
36089 Documentation: git-commit in 1.2.X series defaults to --include.
36090 Documentation: git-ls-files asciidocco.
36091 bisect: remove BISECT_NAMES after done.
36092 combine-diff: diff-files fix.
36093 combine-diff: diff-files fix (#2)
36094 checkout: fix dirty-file display.
36097 Version v1.2.0; changes since v1.1.6:
36098 -------------------------------------
36101 Add freebsd support in Makefile
36104 fix "test: 2: unexpected operator" on bsd
36105 avoid echo -e, there are systems where it does not work
36107 Andreas Ericsson (4):
36108 git-cvsimport: Add -A <author-conv-file> option
36109 update-hook: Major overhaul (handling tags, mainly).
36110 format-patch: Remove last vestiges of --mbox option
36111 .gitignore git-rerere and config.mak
36113 Christian Biesinger (1):
36114 Use a relative path for SVN importing
36116 Daniel Barkalow (4):
36117 Only use a single parser for tree objects
36118 Use struct tree in tar-tree
36119 Use struct commit in tar-tree
36120 Make apply accept the -pNUM option like patch does.
36122 Eric W. Biederman (1):
36123 Fix git-format-patch -s to include a Signed-off-by: line...
36126 rev-list: allow -n<n> as shorthand for --max-count=<n>
36127 rev-list: allow -<n> as shorthand for --max-count=<n>
36129 Florian Weimer (1):
36130 AsciiDoc fixes for the git-svnimport manpage
36132 Fredrik Kuivinen (2):
36133 merge-recursive: Make use of provided bases
36134 merge-recursive: Speed up commit graph construction
36136 J. Bruce Fields (7):
36137 Minor git-reset and git-commit documentation fixes
36138 Mention install-doc in INSTALL
36140 cvs-migration documentation update
36141 Docs: split up pull-fetch-param.txt
36142 Docs: move git url and remotes text to separate sections
36143 Docs: minor git-push copyediting
36146 Run GIT-VERSION-GEN with $(SHELL), not sh.
36147 Add compat/unsetenv.c .
36148 Use sha1_file.c's mkdir-like routine in apply.c.
36149 stat() for existence in safe_create_leading_directories()
36151 Johannes Schindelin (1):
36152 Use a hashtable for objects instead of a sorted list
36155 Add --diff-filter= documentation paragraph
36157 Junio C Hamano (112):
36158 show-branch: take default arguments from configuration file.
36159 git-describe: default to HEAD
36160 Makefile: add 'strip' target
36161 octopus: allow criss-cross and clarify the message when it rejects
36162 Fix the installation location.
36163 checkout: automerge local changes while switching branches.
36164 checkout: merge local modifications while switching branches.
36165 git-push: avoid falling back on pushing "matching" refs.
36166 checkout: show dirty state upon switching branches.
36167 clone: --naked option.
36168 format-patch: always --mbox and show sane Date:
36169 octopus: allow manual resolve on the last round.
36170 Documentation: show-branch.
36171 show-branch: make the current branch and merge commits stand out.
36172 show-branch: --current includes the current branch.
36173 cvsimport: ease migration from CVSROOT/users format
36174 git-push: fix --tags and document it.
36175 Allow building of RPM from interim snapshot.
36176 Revert "git-push: avoid falling back on pushing "matching" refs."
36177 Makefile: do not assume lack of IPV6 means no sockaddr_storage.
36178 fsck-objects: support platforms without d_ino in struct dirent.
36179 DT_UNKNOWN: do not fully trust existence of DT_UNKNOWN
36180 t4011: "sleep 1" is not enough on FAT
36181 Undef DT_* before redefining them.
36182 git-grep: clarification on parameters.
36183 Recommend to remove unused `origin` in a shared repository.
36184 Documentation: finishing touches to the new tutorial.
36185 sample update-hook: sanely handle a new branch head.
36186 git-clone: PG13 --naked option to --bare.
36187 clone: do not create remotes/origin nor origin branch in a bare repository.
36188 clone: do not accept more than one -o option.
36189 tests: adjust breakage by stricter rev-parse
36190 git-fetch --upload-pack: disambiguate.
36191 merge: seed the commit message with list of conflicted files.
36192 diff-tree -c: show a merge commit a bit more sensibly.
36193 diff-tree --cc: denser combined diff output for a merge commit.
36194 combine-diff: fix appending at the tail of a list.
36195 combine-diff: minor output changes.
36196 combine-diff: extend --cc logic to Octopus.
36197 diff-tree --cc: squelch header generation on empty patch.
36198 combine-diff: better hunk splitting.
36199 diff-files: -c and --cc options.
36200 rev-list --remove-empty: add minimum help and doc entry.
36201 abbrev cleanup: use symbolic constants
36202 rev-parse: --abbrev option.
36203 diff-tree: abbreviate merge parent object names with --abbrev --pretty.
36204 rev-parse --abbrev: do not try abbrev shorter than minimum.
36205 Rename rev-parse --abbrev to --short.
36206 pretty_print_commit(): pass commit object instead of commit->buffer.
36207 pretty_print_commit: honor grafts.
36208 diff --abbrev=<n> option fix.
36209 rev-parse: make "whatchanged -- git-fetch-script" work again.
36210 diff-files -c/--cc: combine only when both ours and theirs exist.
36211 Documentation: diff -c/--cc
36212 documentation: cvs migration - typofix.
36213 update-index --index-info: allow stage 0 entries.
36214 rev-list: omit duplicated parents.
36215 combine-diff: reuse diff from the same blob.
36216 combine-diff: update --cc "uninteresting hunks" logic.
36217 combine-diff: add safety check to --cc.
36218 combine-diff: fix placement of deletion.
36219 Documentation: git-diff-tree --cc also omits empty commits
36220 commit.c: "Merge" fix in pretty_print_commit.
36221 combine-diff: add a bit more comments.
36222 combine-diff: show parent line numbers as well.
36223 combine-diff: cleanup.
36224 combine-diff: finishing touches to git-diff-tree --cc
36225 whitespace cleanup.
36226 get_sha1_1: allow octopus^12 to be properly parsed.
36227 git-merge: Properly quote $merge_msg variable.
36228 Do not fall back on vi on dumb terminals.
36229 diff-index: make --cc a synonym for -p for now.
36230 git-diff: use --cc instead of -p.
36232 daemon: do not forbid user relative paths unconditionally under --base-path
36233 daemon: extend user-relative path notation.
36234 combine-diff: remove misguided --show-empty hack.
36235 git-diff-tree --stdin: show all parents.
36236 git-diff: do not fall back on --cc when -[123], --ours etc. are given.
36237 core-tutorial: adjust to recent reality.
36238 combine-diff: do not send NULL to printf
36239 combine-diff: show mode changes as well.
36240 combine-diff: do not punt on removed or added files.
36241 mailinfo: reset CTE after each multipart
36242 read-tree --aggressive
36243 fmt-merge-msg: show summary of what is merged.
36244 git-rerere: reuse recorded resolve.
36245 git-commit: revamp the git-commit semantics.
36246 git-commit: finishing touches.
36247 Do not allow empty name or email.
36248 t6000: fix a careless test library add-on.
36249 ls-files: honour per-directory ignore file from higher directories.
36250 combined-diff: use diffcore before intersecting paths.
36251 call git_config() after setup_git_directory()
36252 combine-diff: move formatting logic to show_combined_diff()
36253 count-delta.c: Match the delta data semantics change in version 3.
36255 find_unique_abbrev() simplification.
36256 combine-diff: Record diff status a bit more faithfully
36257 rev-list: default to abbreviate merge parent names under --pretty.
36258 git-commit -v: have patch at the end.
36259 Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values.
36260 fetch-clone progress: finishing touches.
36261 Only call git-rerere if $GIT_DIR/rr-cache exists.
36262 t5500: adjust to change in pack-object reporting behaviour.
36263 diff-tree: do not default to -c
36264 Avoid using "git-var -l" until it gets fixed.
36265 hashtable-based objects: minimum fixups.
36266 Make pack-objects chattier.
36267 git-commit: show dirtiness including index.
36268 Fix "test: unexpected operator" on bsd
36272 Add howto about separating topics.
36274 Linus Torvalds (14):
36275 Make git-rev-list and git-rev-parse argument parsing stricter
36276 git-whatchanged: exit out early on errors
36277 rev-list: stop when the file disappears
36278 Make the "struct tree_desc" operations available to others
36279 Make git-tar-tree use the tree_desc abstractions
36280 Fix git-rev-parse over-eager errors
36281 diff-tree --always flag
36282 rev-parse lstat() workaround cleanup.
36283 Fix "git diff a..b" breakage
36284 diff-tree -c raw output
36285 Make "git clone" less of a deathly quiet experience
36286 Make "git clone" pack-fetching download statistics better
36287 Fix fetch-clone in the presense of signals
36288 Fix object re-hashing
36291 daemon: Provide missing argument for logerror() call.
36292 http-fetch: Fix object list corruption in fill_active_slots().
36293 http-fetch: Fix message reporting rename of object file.
36294 http: Turn on verbose Curl messages if GIT_CURL_VERBOSE set in environment
36295 http-fetch: Tidy control flow in process_alternate_response
36296 daemon: Set SO_REUSEADDR on listening sockets.
36297 http-fetch: Abort requests for objects which arrived in packs
36299 Martin Langhoff (3):
36300 cvsimport: Add -S <skipfileregex> support and -v announces files retrieved
36301 exportcommit: replace backticks with safe_pipe_capture() or system() - initial pass
36302 cvsexportcommit: add some examples to the documentation
36305 local push/pull env cleanup
36307 Michal Ostrowski (3):
36308 Exec git programs without using PATH.
36309 git-fetch: pass --upload-pack to fetch-pack
36310 git-{fetch,peek-remote} handling of --upload-pack
36312 Nick Hengeveld (2):
36313 Fix HTTP request result processing after slot reuse
36314 Use local structs for HTTP slot callback data
36317 remove delta-against-self bit
36318 count-delta.c: comment fixes
36319 delta micro optimization
36321 Paul Mackerras (2):
36322 gitk: Add braces around if expressions
36323 gitk: Use git-diff-tree --cc for showing the diffs for merges
36326 Disable USE_SYMLINK_HEAD by default
36327 Don't include ../README in git.txt - make a local copy
36330 Use adler32() from zlib instead of defining our own.
36333 Document git-ls-files --directory
36334 Allow diff and index commands to be interrupted
36335 Document git-diff-tree --always
36336 Basic documentation for git-show
36337 Add support for explicit type specifiers when calling git-repo-config
36340 Provide a more meaningful initial "From " line when using --compose in git-send-email.
36341 git-send-email: Add --quiet to reduce some of the chatter when sending emails.
36342 git-send-email: Fully implement --quiet and document it.
36344 Sasha Khapyorsky (1):
36345 git-svnimport.perl: fix for 'arg list too long...'
36348 Add --keep option to keep downloaded packs to git-fetch.
36351 update using-topic-branches
36353 Uwe Kleine-König (4):
36354 Fix generation of "humanish" part of source repo
36355 Remove unneeded header
36356 Use symbolic name SHORT_NAME_AMBIGUOUS as error return value
36357 Make GIT-VERSION-GEN tolerate missing git describe command again
36360 Version v1.1.6; changes since v1.1.5:
36361 -------------------------------------
36363 Fredrik Kuivinen (2):
36364 merge-recursive: Improve the error message printed when merge(1) isn't found.
36365 git-branch: Documentation fixes
36367 J. Bruce Fields (1):
36368 git push -f documentation
36370 Junio C Hamano (1):
36371 pre-commit sample hook: do not barf on the initial import
36374 Version v1.1.5; changes since v1.1.4:
36375 -------------------------------------
36377 Junio C Hamano (1):
36378 checkout: do not make a temporary copy of symlink target.
36381 Version v1.1.4; changes since v1.1.3:
36382 -------------------------------------
36384 Johannes Schindelin (1):
36385 git-fetch-pack: really do not ask for funny refs
36387 Junio C Hamano (1):
36388 Revert "check_packed_git_idx(): check integrity of the idx file itself."
36391 Version v1.1.3; changes since v1.1.2:
36392 -------------------------------------
36394 Junio C Hamano (2):
36395 diffcore-break/diffcore-rename: integer overflow.
36396 describe: omit clearing marks on the last one.
36399 Version v1.1.2; changes since v1.1.1:
36400 -------------------------------------
36402 J. Bruce Fields (1):
36403 Documentation: clarify fetch parameter descriptions.
36405 Junio C Hamano (6):
36406 update-index: work with c-quoted name
36407 describe: do not silently ignore indescribable commits
36408 name-rev: do not omit leading components of ref name.
36409 show-branch: handle [] globs as well.
36410 Documentation: git-commit -a
36411 Documentation: git-reset - interrupted workflow.
36414 Add git-describe to .gitignore.
36417 Version v1.1.1; changes since v1.1.0:
36418 -------------------------------------
36420 H. Peter Anvin (1):
36421 For release tarballs, include the proper version
36423 Johannes Schindelin (1):
36424 glossary: explain "master" and "origin"
36426 Junio C Hamano (1):
36427 GIT-VERSION-GEN: detect dirty tree and mark the version accordingly.
36430 Version v1.1.0; changes since v1.0.13:
36431 --------------------------------------
36433 Johannes Schindelin (3):
36434 git-clone: Support changing the origin branch with -o
36435 Introduce core.sharedrepository
36436 git-init-db: initialize shared repositories with --shared
36439 Make GIT-VERSION-GEN tolerate missing git describe command
36441 Junio C Hamano (23):
36442 Post 1.0.0 development track.
36443 Versioning scheme changes.
36444 merge-recursive: conflicting rename case.
36445 whatchanged: customize diff-tree output
36446 rev-parse: --show-cdup
36447 check_packed_git_idx(): check integrity of the idx file itself.
36448 checkout: sometimes work from a subdirectory.
36449 ls-tree: chomp leading directories when run from a subdirectory
36450 git-clone: do not special case dumb http.
36451 Tutorial: mention shared repository management.
36452 git-describe: really prefer tags only.
36453 git-describe: use find_unique_abbrev()
36454 git-describe: --tags and --abbrev
36455 git-describe: still prefer annotated tag under --all and --tags
36456 git-describe: documentation.
36457 Makefile: use git-describe to mark the git version.
36458 send-pack/receive-pack: allow errors to be reported back to pusher.
36459 git-fetch: auto-following tags.
36460 ls-files --others --directory: fix a bug with index entry ordering
36461 ls-files --others --directory: give trailing slash
36462 git-status: use ls-files --others --directory for untracked list.
36463 ls-files --others --directory: test
36464 describe: allow more than one revs to be named.
36466 Linus Torvalds (2):
36467 Add a "git-describe" command
36468 ls-files -o: optionally skip showing the contents in "untracked" directories
36470 Lukas Sandström (1):
36471 git-pack-redundant: speed and memory usage improvements
36474 git-daemon --base-path
36476 YOSHIFUJI Hideaki (1):
36477 GIT: Support [address] in URLs
36480 Add an optional limit to git-cherry
36481 Add a minimal test for git-cherry
36482 Add a test for rebase when a change was picked upstream
36485 Version v1.0.13; changes since v1.0.12:
36486 ---------------------------------------
36488 Junio C Hamano (1):
36489 checkout: do not make a temporary copy of symlink target.
36492 Version v1.0.12; changes since v1.0.11:
36493 ---------------------------------------
36495 Johannes Schindelin (1):
36496 git-fetch-pack: really do not ask for funny refs
36498 Junio C Hamano (1):
36499 Revert "check_packed_git_idx(): check integrity of the idx file itself."
36502 Version v1.0.11; changes since v1.0.10:
36503 ---------------------------------------
36505 Junio C Hamano (1):
36506 diffcore-break/diffcore-rename: integer overflow.
36509 Version v1.0.10; changes since v1.0.9:
36510 --------------------------------------
36512 J. Bruce Fields (1):
36513 Documentation: clarify fetch parameter descriptions.
36515 Junio C Hamano (5):
36516 update-index: work with c-quoted name
36517 name-rev: do not omit leading components of ref name.
36518 show-branch: handle [] globs as well.
36519 Documentation: git-commit -a
36520 Documentation: git-reset - interrupted workflow.
36523 Version v1.0.9; changes since v1.0.8:
36524 -------------------------------------
36526 Johannes Schindelin (1):
36527 glossary: explain "master" and "origin"
36530 Version v1.0.8; changes since v1.0.7:
36531 -------------------------------------
36534 Substitute "/" with $opt_s in tag names as well as branch names
36536 Junio C Hamano (7):
36537 unpack-objects: default to quiet if stderr is not a tty.
36538 Retire debian/ directory.
36539 prune: do not show error from pack-redundant when no packs are found.
36540 Compilation: zero-length array declaration.
36541 tar-tree: finish honoring extractor's umask in git-tar-tree.
36542 revert/cherry-pick: handle single quote in author name.
36543 mailsplit: allow empty input from stdin
36546 Teach cvsexportcommit to add new files
36547 Fix typo in debug stanza of t2001
36548 Fix git-format-patch usage string wrt output modes.
36551 Version v1.0.7; changes since v1.0.6:
36552 -------------------------------------
36555 trivial: retval of waitpid is not errno
36556 trivial: O_EXCL makes O_TRUNC redundant
36557 fix potential deadlock in create_one_file
36558 use result of open(2) to check for presence
36559 trivial: typo in git-commit.sh
36560 trivial: clarify, what are the config's user.name and user.email about
36561 trivial: remove the dots at the end of file names from merge-one-file
36562 trivial: use git-repo-config to detect if the test can be run on the repository
36563 trivial: use git-repo-config to detect how to run tests in the test repository
36564 trivial: .gitignore precompiled python modules
36565 trivial: check, if t/trash directory was successfully created
36566 use GIT_DIR instead of /var/tmp
36568 Amos Waterland (1):
36569 AIX compile fix for repo-config.c
36571 Andreas Ericsson (1):
36572 git: grok 'help' to mean '--help'.
36575 svnimport: support repositories requiring SSL authentication
36576 Documentation/git-svnimport: document -T and -t switches correctly
36579 Fix skipping merge-order test with NO_OPENSSL=1.
36582 Fix git-symbolic-ref typo in git.txt.
36585 git-init-db(1): Describe --shared and the idempotent nature of init-db
36586 Wrap synopsis lines and use [verse] to keep formatting
36588 Junio C Hamano (6):
36589 Documentation: spell.
36590 code comments: spell
36591 ?alloc: do not return NULL when asked for zero bytes
36592 git-fetch --tags: reject malformed tags.
36593 format-patch/commit: Quote single quote in the author name properly.
36594 t3300: skip when filesystem does not like TAB in filenames.
36596 Linus Torvalds (1):
36597 Fix nasty approxidate bug
36600 Version v1.0.6; changes since v1.0.5:
36601 -------------------------------------
36603 Junio C Hamano (3):
36604 Guard a test against wc that pads its output with whitespace
36605 Fix bogus tests on rev-list output.
36606 Do not mark tags fetched via --tags flag as mergeable
36609 copy_fd: close ifd on error
36612 Version v1.0.5; changes since v1.0.4:
36613 -------------------------------------
36616 short circuit out of a few places where we would allocate zero bytes
36618 Johannes Schindelin (1):
36619 Handle symlinks graciously
36621 Junio C Hamano (2):
36622 avoid asking ?alloc() for zero bytes.
36623 t5300: avoid false failures.
36626 Version v1.0.4; changes since v1.0.3:
36627 -------------------------------------
36629 Junio C Hamano (5):
36630 check_packed_git_idx(): check integrity of the idx file itself.
36631 show-branch: usability updates.
36632 merge --no-commit: tweak message
36633 ls-files --full-name: usage string and documentation.
36634 mailinfo: iconv does not like "latin-1" -- should spell it "latin1"
36637 Version v1.0.3; changes since v1.0.2:
36638 -------------------------------------
36641 \n usage in stderr output
36643 Johannes Schindelin (2):
36644 git-format-patch should show the correct version
36645 sha1_to_hex: properly terminate the SHA1
36647 Junio C Hamano (1):
36648 send-pack: reword non-fast-forward error message.
36650 Nick Hengeveld (1):
36651 Fix for http-fetch from file:// URLs
36654 sanity check in add_packed_git()
36657 Version v1.0.2; changes since v1.0.1:
36658 -------------------------------------
36660 Junio C Hamano (1):
36661 server-info: skip empty lines.
36664 quote.c: Make loop control more readable.
36667 Version v1.0.1; changes since v1.0.0b:
36668 --------------------------------------
36671 Version v1.0.0b; changes since v1.0.0a:
36672 ---------------------------------------
36674 Junio C Hamano (1):
36675 server-info: skip empty lines.
36678 quote.c: Make loop control more readable.
36681 Version v1.0.0a; changes since v1.0.0:
36682 --------------------------------------
36684 Johannes Schindelin (1):
36685 Avoid misleading success message on error
36687 Junio C Hamano (3):
36688 objects/info/packs: work around bug in http-fetch.c::fetch_indices()
36689 http-fetch.c: fix objects/info/pack parsing.
36693 An off-by-one bug found by valgrind
36696 Version v1.0.0; changes since v1.0rc6:
36697 --------------------------------------
36700 Documentation/git-archimport: document -o, -a, f, -D options
36702 Fredrik Kuivinen (3):
36703 git-diff: Usage string clean-up
36704 git-log: Add usage string
36705 git-whatchanged: Add usage string
36710 Johannes Schindelin (1):
36711 We do not like "HEAD" as a new branch name
36713 Junio C Hamano (32):
36714 clone-pack: make it usable for partial branch cloning.
36715 Documentation: tutorial
36716 get_sha1_basic(): corner case ambiguity fix
36718 Sort globbed refname in show-branch.
36719 refs.c: off-by-one fix.
36720 Examples of resetting.
36721 Forbid pattern maching characters in refnames.
36723 Documentation: HTTP needs update-server-info.
36724 Remove misguided branch disambiguation.
36725 Revert "refs.c: off-by-one fix."
36726 Revert "We do not like "HEAD" as a new branch name"
36727 Revert "get_sha1_basic(): corner case ambiguity fix"
36728 fetch-pack: -k option to keep downloaded pack.
36729 clone-pack: remove unused and undocumented --keep flag
36730 Documentation: typos and small fixes in "everyday".
36731 howto/using-topic-branches: Recommend public URL git://git.kernel.org/
36732 rev-list --objects: fix object list without commit.
36733 Documentation: stdout of update-hook is connected to /dev/null
36734 Remove generated files */*.py[co]
36735 Remove unused cmd-rename.sh
36737 tests: make scripts executable
36738 xread/xwrite: do not worry about EINTR at calling sites.
36739 diff: --abbrev option
36740 diff --abbrev: document --abbrev=<n> form.
36741 format-patch: make sure header and body are separated.
36744 ce_smudge_racily_clean_entry: explain why it works.
36745 A shared repository should be writable by members.
36747 Linus Torvalds (3):
36748 Make "git help" react to window size correctly
36749 Make "git help" sort git commands in columns
36750 Make "git-send-pack" less verbose by default
36752 Martin Langhoff (1):
36753 svnimport: exit cleanly when we are up to date
36756 small cleanup for diff-delta.c
36759 Version v1.0rc6; changes since v1.0rc5:
36760 ---------------------------------------
36762 Amos Waterland (1):
36763 git rebase loses author name/email if given bad email address
36765 Fredrik Kuivinen (12):
36766 Usage message clean-up, take #2
36767 Trivial usage string clean-up
36768 git-verify-tag: Usage string clean-up, emit usage string at incorrect invocation
36769 git-revert: Usage string clean-up
36770 git-am: Usage string clean-up
36771 git-applypatch: Usage string clean-up, emit usage string at incorrect invocation
36772 git-cherry: Usage string clean-up, use the 'usage' function
36773 git-fetch: Usage string clean-up, emit usage string at unrecognized option
36774 git-lost-found: Usage string clean-up, emit usage string at incorrect invocation
36775 git-prune: Usage string clean-up, use the 'usage' function
36776 git-rebase: Usage string clean-up, emit usage string at incorrect invocation
36777 git-repack: Usage string clean-up, emit usage at incorrect invocation
36779 H. Peter Anvin (1):
36780 git-am support for naked email messages (take 2)
36782 Junio C Hamano (22):
36783 diffcore-break.c: check diff_delta() return value.
36784 Add deltifier test.
36785 diff-delta.c: allow delta with empty blob.
36786 Everyday: some examples.
36787 Revert "diff-delta.c: allow delta with empty blob."
36788 Revert "Add deltifier test."
36789 diffcore-break: do not break too small filepair.
36790 Everyday: a bit more example.
36791 Documentation: more examples.
36792 Documentation: fix missing links to git(7)
36793 Documentation: diff examples.
36794 Documentation: not learning core git commands.
36795 git-clone: tell the user a bit more about clone-pack failure.
36796 allow merging any committish
36797 checkout-index: fix checking out specific path.
36798 Everyday: a bit more examples.
36799 t3200: branch --help does not die anymore.
36800 applypatch: no need to do non-portable [[ ... ]]
36801 Documentation: topic branches
36802 rebase: do not get confused in fast-forward situation.
36803 Do not let errors pass by unnoticed when running `make check'.
36804 mailinfo and git-am: allow "John Doe <johndoe>"
36806 Lukas Sandström (1):
36807 Bugfixes for git-rebase
36809 Martin Atukunda (1):
36810 define MAXPATHLEN for hosts that don't support it
36813 Make git-send-pack exit with error when some refs couldn't be pushed out
36816 Version v1.0rc5; changes since v1.0rc4:
36817 ---------------------------------------
36820 use "git init-db" in tests
36822 Daniel Barkalow (3):
36823 Warn when send-pack does nothing
36824 Clean up file descriptors when calling hooks.
36825 Allow saving an object from a pipe
36828 archimport: first, make sure it still compiles
36829 archimport: remove String::ShellQuote dependency.
36830 archimport: fix -t tmpdir switch
36831 archimport: remove git wrapper dependency
36832 archimport: add -D <depth> and -a switch
36833 archimport: safer log file parsing
36834 archimport: Add the accurate changeset applyer
36835 archimport: Fix a bug I introduced in the new log parser
36836 archimport: fix a in new changeset applyer addition
36839 Document config.mak in INSTALL.
36840 Initial AIX portability fixes.
36841 Use printf rather than echo -n.
36844 Added documentation for few missing options.
36846 Junio C Hamano (51):
36847 compat/setenv: do not free what we fed putenv(3).
36848 git.c: two fixes, gitsetenv type and off-by-one error.
36849 show-branch: allow glob pattern to name branches to show.
36850 Documentation: rebase does not use cherry-pick anymore.
36851 struct tree: remove unused field "parent"
36852 git.c: remove excess output for debugging when command is too long.
36853 sha1_file.c: make sure packs in an alternate odb is named properly.
36854 server-info.c: drop unused D lines.
36855 server-info: stop sorting packs by latest date.
36856 server-info: throw away T computation as well.
36857 Documentation: talk about pathspec in bisect.
36858 Documentation: git-mv manpage workaround.
36859 Documentation: git-diff asciidoc table workaround.
36860 Documentation: push/receive hook references.
36861 Documentation: shared repository management in tutorial.
36862 server-info.c: use pack_local like everybody else.
36863 server-info.c: and two functions are not used anymore.
36864 config.c: remove unnecessary header in minimum configuration file.
36865 Clean up compatibility definitions.
36867 git-mv to work with Perl 5.6
36868 hash-object: -- and --help
36869 init-db: check extra arguments and complain.
36870 write-tree: check extra arguments and die but be a bit more helpful.
36871 Documentation: hash-object.
36872 Documentaiton (read-tree): update description of 3-way
36873 git-merge-one-file: resurrect leading path creation.
36874 qsort() ptrdiff_t may be larger than int
36875 checkout-index: allow checking out from higher stages.
36876 git-merge-one: new merge world order.
36877 update-index: allow --index-info to add higher stages.
36878 Documentation: git.html/git.7
36879 Documentation(glossary): minor formatting clean-ups.
36880 Documentation(cvs-migration): minor cleanups.
36881 Documentation(tutorial): adjust merge example to the new merge world order.
36882 refs.c: make sure leading directories exist before writing a ref.
36883 Make sure we use compat/subprocess.py with Python 2.3 while running tests.
36884 Documentation: recursive is the default strategy these days.
36885 show-branch: comment typo
36886 Documentation: git-prune
36887 qsort(): ptrdiff_t may be larger than int
36888 git-prune: never lose objects reachable from our refs.
36889 Use GIT_EXEC_PATH explicitly for initial git-init-db in tests.
36890 Everyday GIT with 20 commands
36891 Link Everyday GIT to main documentation tree.
36892 t3300: funny name test
36893 t0000: catch trivial pilot errors.
36894 format-patch: use same number of digits in numbers
36895 merge-recursive: leave unmerged entries in the index.
36896 merge-recursive: cleanup setIndexStages
36897 t/t6022: a new test for renaming merge.
36899 Nikolai Weibull (16):
36900 Document the --non-empty command-line option to git-pack-objects.
36901 Fix the description of --utf8 and --keep to git-am.
36902 Use uniform description for the '--' option.
36903 Documentation/git-commit.txt: Add long options and -- to documentation.
36904 Documentation/git-verify-pack.txt: added documentation for --.
36905 Documentation/git-cvsimport.txt: Fix a slight glitch in description heading.
36906 Documentation/git-cherry-pick: Add --replay and --no-commit.
36907 Add documentation for git-revert and git-cherry-pick.
36908 Add documentation for the --topo-order option to git-show-branch.
36909 Documentation/git-format-patch.txt: Add --signoff, --check, and long option-names.
36910 Documentation/git-ls-remote.txt: Add -h and -t.
36911 Documentation/git-repack.txt: Add -l and -n.
36912 Documentation/git-http-fetch.txt: Document the commit-id argument.
36913 Documentation/git-update-server-info.txt: Add -f alias for --force to documentation.
36914 Documentation/git-tag.txt: Fix the order of sections (DESCRIPTION should come before OPTIONS).
36915 Documentation/git-read-tree.txt: Add --reset to SYNOPSIS.
36917 Paul Mackerras (3):
36918 gitk: Factored out some common code into a new start_rev_list procedure
36919 gitk: Some improvements for the code for updating the display
36920 gitk: Work around Tcl's non-standard names for encodings
36923 Update the git-ls-tree documentation
36924 Document the --(no-)edit switch of git-revert and git-cherry-pick
36926 Sven Verdoolaege (1):
36927 gitk: add Update menu item.
36930 Version v1.0rc4; changes since v1.0rc3:
36931 ---------------------------------------
36934 Documentation/git-log.txt: trivial typo fix.
36937 speedup allocation in pack-redundant.c
36938 remove unused variable
36939 arguments cleanup and some formatting
36940 Add tests for git-mv in subdirectories
36941 git wrapper: more careful argument stuffing
36943 Alexander Litvinov (1):
36944 git-mv is not able to handle big directories
36946 Andreas Ericsson (13):
36947 git-daemon: --inetd implies --syslog
36948 C implementation of the 'git' program, take two.
36949 Update git(7) man-page for the C wrapper.
36950 git --help COMMAND brings up the git-COMMAND man-page.
36951 daemon.c: fix arg parsing bugs
36952 Library code for user-relative paths, take three.
36953 Server-side support for user-relative paths.
36954 Client side support for user-relative paths.
36955 Documentation update for user-relative paths.
36956 git-reset.txt: Small fix + clarifications.
36957 git-daemon support for user-relative paths.
36958 Introduce $(ALL_PROGRAMS) for 'all:' and 'install:' to operate on.
36959 cvsimport: Don't let local settings hinder cvs user-migration.
36962 remove shellquote usage for tags
36963 archimport: don't die on merge-base failure
36964 Disambiguate the term 'branch' in Arch vs git
36966 Frank Sorenson (1):
36967 gitk: Specify line hover font
36969 Fredrik Kuivinen (5):
36970 merge-recursive: Replace 'except:'
36971 git-merge: Exit with code 2 if no strategy was able to handle the merge.
36972 test-lib.sh: Add new function, test_expect_code
36973 New test case: merge with directory/file conflicts
36974 New test case: Criss-cross merge
36976 H. Peter Anvin (3):
36977 git-core-foo -> git-foo, except the core package
36978 rename/copy score parsing updates.
36979 A few more options for git-cat-file
36982 Fix typo in http-push.c
36985 Add compat/setenv.c, use in git.c.
36988 gitk: put braces around exprs
36990 Johannes Schindelin (13):
36991 Add config variable core.symrefsonly
36992 Fix tests with new git in C
36993 Give python a chance to find "backported" modules
36994 Add functions git_config_set() and git_config_set_multivar()
36995 Add git-config-set, a simple helper for scripts to set config variables
36996 Add documentation for git-config-set
36997 Add test case for git-config-set
36998 git-config-set: add more options
36999 git-config-set: support selecting values by non-matching regex
37000 git-config-set: Properly terminate strings with '\0'
37001 Allow hierarchical section names
37002 Rename git-config-set to git-repo-config
37003 Make git-mv work in subdirectories, too
37006 Fix typos and minor format issues.
37009 Fix git(1) link to git-index-pack
37011 Josef Weidendorfer (6):
37012 Fix git-mv for moving directories with 1 file
37013 git-mv: shrink usage, no usage on error
37014 git-mv: keep git index consistent with file system on failed rename
37015 git-mv: fully detect 'directory moved into itself'
37016 Small fixes in Documentation/git-mv.txt
37017 git-mv: follow -k request even on failing renames
37019 Junio C Hamano (108):
37020 Documentation: do not blindly run 'cat' .git/HEAD, or echo into it.
37021 diff: make default rename detection limit configurable.
37022 sha1_file.c::add_packed_git(): fix type mismatch.
37023 git wrapper: basic fixes.
37024 git-apply: fail if a patch cannot be applied.
37025 git-am: --resolved.
37026 apply: allow-binary-replacement.
37028 tests: binary diff application.
37029 Add approxidate test calls.
37030 Deal with binary diff output from GNU diff 2.8.7
37031 git-am: --binary; document --resume and --binary.
37032 git-prune: quote possibly empty $dryrun as parameter to test
37033 Cygwin *might* be helped with NO_MMAP
37034 Do not show .exe in git command list.
37035 git-branch: -f to forcibly reset branch head.
37036 Rewrite rebase to use git-format-patch piped to git-am.
37037 readrefs: grab all refs with one call to ls-remote.
37038 git-count-objects: dc replacement
37039 git-repack: do not do complex redundancy check.
37040 Documentation: rebase-from-internal minor updates.
37041 merge-one-file: remove empty directories
37042 merge-recursive::removeFile: remove empty directories
37043 http.c: reorder to avoid compilation failure.
37044 Do not DWIM in userpath library under strict mode.
37045 Documentation: add hooks/update example.
37046 merge-one-file: use rmdir -p
37047 Fix "do not DWIM" patch to enter_repo"
37048 Make sure heads/foo and tags/foo do not confuse things.
37049 Fix hooks/update template.
37050 format-patch: fix two-argument special case, and make it easier to pick single commits
37051 rename detection with -M100 means "exact renames only".
37052 tutorial: setting up a tree for subsystem maintainers
37053 daemon: further tweaks.
37055 Move diff.renamelimit out of default configuration.
37056 git-var: constness and globalness cleanup.
37057 pack-redundant: type cleanups.
37058 git-merge: make recursive the default strategy
37059 git-revert: make --edit default.
37060 Teach update-index to read from ls-tree.
37061 diff-tree: teach single-commit diff-tree to honour grafts
37062 config.c: avoid shadowing global.
37063 Prevent "git-commit -a path1 path2..."
37064 parse-remote and ls-remote clean-up.
37065 git-sh-setup: die if outside git repository.
37066 git-var: make it work in subdirectory.
37067 setup_git_directory: make sure GIT_DIR is a valid repository.
37068 git-sh-setup: move the repository check to a core program.
37069 shell.c: complain on insufficient arguments.
37070 name-rev: fix off-by-one error in --stdin.
37071 format-patch: output filename reported to stdout verbatim.
37072 Repository format version check.
37073 Check repository format version in enter_repo().
37074 init-db: check template and repository format.
37075 setup_git_directory(): check repository format version.
37076 Introduce i18n.commitencoding.
37077 mailinfo: allow -u to fall back on latin1 to utf8 conversion.
37078 mailinfo: Use i18n.commitencoding
37079 mailinfo: Do not use -u=<encoding>; say --encoding=<encoding>
37080 config.c: constness tightening to avoid compilation warning.
37081 gitk: Use i18n.commitencoding configuration item.
37082 git-mv: quote $src in regexp properly.
37083 rebase: one safety net, one bugfix and one optimization.
37084 name-rev: fix parent counting.
37085 Documentation: Describe merge operation a bit better.
37086 write_name_quoted(): make one of the path a counted string.
37087 ls-tree: Resurrect funny name quoting lost during rewrite.
37088 ls-tree: match the test to the new semantics.
37089 bisect: quote pathnames for eval safety.
37090 working from subdirectory: preparation
37091 git-apply: work from subdirectory.
37092 peek-remote: honor proxy config even from subdirectory.
37093 fsck-objects: work from subdirectory.
37094 checkout-index: work from subdirectory.
37095 hash-object: work within subdirectory.
37096 ls-tree: work from subdirectory.
37097 Make networking commands to work from a subdirectory.
37098 Make the rest of commands work from a subdirectory.
37099 count-objects: make it operable from a subdirectory.
37100 ls-remote: define die() now we do not use git-sh-setup
37101 branch: make it operable from a subdirectory.
37102 lost-found: make it operable from a subdirectory.
37103 tag: make it operable from a subdirectory.
37104 verify-tag: make it operable from a subdirectory.
37105 define die() for scripts that use it.
37106 hash-object.c: type-fix to squelch compiler warnings.
37107 applymbox: typofix to enable -m option.
37108 applypatch: use "index" lines not "applies-to".
37109 format-patch: remove applies-to.
37110 format-patch: do not abuse 3-dash marker line.
37111 format-patch: run diff in C locale
37112 git-diff: do not turn off -p/-M with any diff options.
37113 diff-files: show diffs with stage0 and unmerged stage at the same time.
37114 merge-recursive: match the unmerged index entry behaviour with merge-resolve
37115 Tutorial: adjust merge example to recursive strategy.
37116 Documentation: describe '-f' option to git-fetch.
37117 Makefile: say the default target upfront.
37118 ls-tree: resurrect '-d' to mean 'show trees only'
37119 ls-tree: --name-only
37120 git-merge-one-file: do not worry about 'rmdir -p' not removing directory.
37121 merge-recursive: adjust git-ls-tree use for the latest.
37122 t3100: add ls-tree -t and -d tests.
37123 merge-one-file: make sure we create the merged file.
37124 merge-one-file: make sure we do not mismerge symbolic links.
37125 git-merge documentation: conflicting merge leaves higher stages in index
37126 documentation: git-bisect (help HTML break man)
37127 daemon.c and path.enter_repo(): revamp path validation.
37130 git-cvsexportcommit.perl: Fix usage() output.
37131 git-cvsexportcommit.perl: use getopts to get binary flags
37132 git-cvsexportcommit.perl: exit with non-0 status if patch fails.
37133 git-cvsexportcommit.perl: fix typos in output
37135 Linus Torvalds (14):
37136 Disallow empty pattern in "git grep"
37137 git's rev-parse.c function show_datestring presumes gnu date
37138 Teach "approxidate" about weekday syntax
37139 Make "git fetch" less verbose by default
37140 Teach "approxidate" about weekday syntax
37141 git-repack: Properly abort in corrupt repository
37142 Allow editing of a revert-message
37143 ls-tree: major rewrite to do pathspec
37144 ls-tree: further cleanup to parallel ls-files.
37145 ls-tree: further tweaks of the rewrite
37146 bisect: limit the searchspace by pathspecs
37147 diff-files: -1/-2/-3 to diff against unmerged stage.
37148 merge-one-file: leave unmerged index entries upon automerge failure.
37149 git-ls-tree: add "-t" option to always show the tree entries
37152 max-count in terms of intersection
37154 Lukas Sandström (8):
37155 Fix llist_sorted_difference_inplace in git-pack-redundant
37156 Make git-pack-redundant non-horribly slow on large sets of packs
37157 Fix bug introduced by the latest changes to git-pack-redundant
37158 Fix a bug in get_all_permutations.
37159 Remove all old packfiles when doing "git repack -a -d"
37160 Improve the readability of git-pack-redundant
37161 Document the "ignore objects" feature of git-pack-redundant
37162 Make git-pack-redundant take a list of unimportant objs on stdin
37164 Martin Langhoff (1):
37165 archimport: allow for old style branch and public tag names
37167 Matthias Urlichs (1):
37168 SVN import: Use one log call
37170 Nick Hengeveld (7):
37171 Isolate shared HTTP request functionality
37172 Make http-fetch request types more clear
37173 Improve pack list response handling
37174 Improve XML parsing in http-push
37175 http-push memory/fd cleanup
37176 Decide whether to build http-push in the Makefile
37180 'make clean' forgot about some files
37183 proxy-command support for git://
37185 Paul Mackerras (5):
37186 Add -r flag and some speedups
37187 gitk: Fix some bugs introduced by speedup changes
37188 gitk: Disable fastdate stuff for now
37189 gitk: Fix diff this->selected and selected->this functions
37190 gitk: Add a preferences dialog with some basic stuff
37193 git-daemon not listening when compiled with -DNO_IPV6
37194 Fixed git:// IPv4 address problem when compiled with -DNO_IPV6.
37197 symref support for import scripts
37198 gitk: use git-diff-tree --no-commit-id
37199 gitk: UTF-8 support
37200 git-clone --shared should imply --local
37203 Fix bunch of fd leaks in http-fetch
37206 git-repack: Fix variable name
37209 Add Python version checks to the Makefile to automatically set WITH_OWN_SUBPROCESS_PY
37212 git-fsck-objects: Free tree entries after use
37213 Rework object refs tracking to reduce memory usage
37215 Stefan-W. Hahn (1):
37216 gitk: moving all three panes if clicking on an arrow.
37219 Fix sparse warnings
37220 Move couple of ifdefs after "include config.mk"
37222 Tommi Virtanen (1):
37223 Do not attempt to access literal dirname "GIT_OBJECT_DIRECTORY".
37226 Update pull/fetch --tags documentation
37228 YOSHIFUJI Hideaki (2):
37229 GIT: Fix compilation error in connect.c
37230 Fix a warning about unused value.
37233 Fix gitk this->selected diffs
37236 documentation: clarify read-tree --reset
37237 documentation: git-tag
37240 Version v1.0rc3; changes since v1.0rc2:
37241 ---------------------------------------
37243 Junio C Hamano (1):
37244 GIT 0.99.9j aka 1.0rc3
37247 Version v1.0rc2; changes since v1.0rc1:
37248 ---------------------------------------
37251 allow git-update-ref create refs with slashes in names
37253 Andreas Ericsson (1):
37254 git-branch: Mention -d and -D in man-page.
37256 Josef Weidendorfer (2):
37257 Bugfix: stop if directory already exists
37258 Remove git-rename. git-mv does the same
37260 Junio C Hamano (5):
37261 Debian: build-depend on libexpat-dev.
37262 Rename lost+found to lost-found.
37263 Separate LDFLAGS and CFLAGS.
37264 apply: fix binary patch detection.
37265 Update topo-order test.
37268 Fix compilation warnings in pack-redundant.c
37270 Linus Torvalds (1):
37271 Fix git-rev-list "date order" with --topo-order
37273 Matthias Urlichs (3):
37274 debian packaging: git-cvs needs cvsps
37275 Remove trailing slashes
37276 Depend on asciidoc 7 (at least).
37278 Nick Hengeveld (2):
37279 Fix for multiple alternates requests in http-fetch
37280 Fix fd leak in http-fetch
37282 Nikolai Weibull (3):
37283 Document the -n command-line option to git-unpack-objects
37284 Document a couple of missing command-line options.
37285 Documentation nitpicking
37287 Thomas Matysik (2):
37288 Add expat and expat-devel dependencies (for http-push) to RPM spec.
37289 Split gitk into seperate RPM package