aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maintJunio C Hamano2010-02-10
|\
| * checkout -m path: fix recreating conflictsJunio C Hamano2010-01-06
* | Merge branch 'rs/maint-archive-match-pathspec' into maintJunio C Hamano2010-02-10
|\ \
| * | archive: complain about path specs that don't match anythingRené Scharfe2009-12-30
* | | check-ref-format documentation: fix enumeration mark-upJunio C Hamano2010-02-10
* | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-02-08
|\ \ \
| * | | blame: prevent a segv when -L given start > EOFJay Soffian2010-02-08
| * | | Merge branch 'sb/maint-octopus' into maint-1.6.5Junio C Hamano2010-02-01
| |\ \ \
| * \ \ \ Merge branch 'bg/maint-add-all-doc' into maint-1.6.5Junio C Hamano2010-02-01
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/maint-push-doc-status' into maintJunio C Hamano2010-02-08
|\ \ \ \ \ \
| * | | | | | git-push: document all the status flags used in the outputJunio C Hamano2010-02-08
* | | | | | | Merge branch 'jc/maint-imap-config-parse' into maintJunio C Hamano2010-02-08
|\ \ \ \ \ \ \
| * | | | | | | Fix parsing of imap.preformattedHTML and imap.sslverifyJunio C Hamano2010-02-08
* | | | | | | | Merge branch 'jc/maint-doc-git-add-example' into maintJunio C Hamano2010-02-08
|\ \ \ \ \ \ \ \
| * | | | | | | | git-add documentation: Fix shell quoting exampleJunio C Hamano2010-02-08
* | | | | | | | | archive: simplify archive format guessingRené Scharfe2010-02-07
* | | | | | | | | Update git fsck --full short description to mention packsWesley J. Landaker2010-02-05
* | | | | | | | | Merge branch 'jc/maint-limit-note-output' into maintJunio C Hamano2010-02-05
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix "log --oneline" not to show notesJunio C Hamano2010-01-21
| * | | | | | | | | Fix "log" family not to be too agressive about showing notesJunio C Hamano2010-01-20
* | | | | | | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-29
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | fix memcpy of overlapping areaJeff King2010-01-29
* | | | | | | | | | bash: don't offer remote transport helpers as subcommandsSZEDER Gábor2010-01-28
* | | | | | | | | | Merge branch 'maint' of git://git.spearce.org/git-gui into maintJunio C Hamano2010-01-24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-gui: work from the .git dirGiuseppe Bilotta2010-01-23
| * | | | | | | | | | git-gui: Fix applying a line when all following lines are deletionsJeff Epler2010-01-23
| * | | | | | | | | | git-gui: Correct file_states when unstaging partly staged entryJens Lehmann2010-01-23
| * | | | | | | | | | git-gui: Fix gitk for branch whose name matches local filePeter Krefting2010-01-23
| * | | | | | | | | | git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in syncChristopher Beelby2010-01-23
| * | | | | | | | | | git-gui: handle really long error messages in updateindex.Pat Thoyts2010-01-23
| * | | | | | | | | | git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"Vitaly _Vi Shukela2010-01-06
| * | | | | | | | | | git-gui: Makefile: consolidate .FORCE-* targetsJonathan Nieder2010-01-06
* | | | | | | | | | | ignore duplicated slashes in make_relative_path()Junio C Hamano2010-01-22
* | | | | | | | | | | merge-recursive: do not return NULL only to cause segfaultJunio C Hamano2010-01-21
* | | | | | | | | | | retry request without query when info/refs?query failsTay Ray Chuan2010-01-21
* | | | | | | | | | | Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maintJunio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | status: don't require the repository to be writableJunio C Hamano2010-01-19
* | | | | | | | | | | Git 1.6.6.1v1.6.6.1Junio C Hamano2010-01-20
* | | | | | | | | | | Merge branch 'bg/maint-remote-update-default' into maintJunio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix "git remote update" with remotes.defalt setBjörn Gustavsson2009-12-31
* | | | | | | | | | | | Merge branch 'sb/maint-octopus' into maintJunio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | octopus: remove dead codeStephen Boyd2009-12-13
| * | | | | | | | | | | octopus: reenable fast-forward mergesStephen Boyd2009-12-13
| * | | | | | | | | | | octopus: make merge process simpler to followStephen Boyd2009-12-13
* | | | | | | | | | | | Merge branch 'bg/maint-add-all-doc' into maintJunio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | git-rm doc: Describe how to sync index & work treeBjörn Gustavsson2010-01-07
| * | | | | | | | | | | git-add/rm doc: Consistently back-quoteBjörn Gustavsson2009-12-07
| * | | | | | | | | | | Documentation: 'git add -A' can remove filesBjörn Gustavsson2009-12-07
* | | | | | | | | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | / / / / / / | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Git 1.6.5.8v1.6.5.8Junio C Hamano2010-01-20